generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,937 Commits 24 Branches 241 Tags 173 MiB
73a2d16bfa
Commit Graph

61937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
0371eaebcd Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f' 
* commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f':
  Add missing headers to make template files compile (more) standalone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-26 14:50:55 +01:00
Michael Niedermayer
3262069101 Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08' 
* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08':
  dsputil_template: Move bits that are used templatized into separate file

Conflicts:
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-26 14:40:49 +01:00
Michael Niedermayer
152c8fd856 Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f' 
* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
  dsputil: Move hpel_template #include out of dsputil_template

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-26 14:32:24 +01:00
Michael Niedermayer
8e8347b892 Merge commit 'd0aabeab23755ee906440505ad2097c0f1493e80' 
* commit 'd0aabeab23755ee906440505ad2097c0f1493e80':
  x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

See: c8246d3766
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-26 14:17:43 +01:00
Diego Biurrun
efc7290eb6 x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init 
There is no point in having a separate file just for the instantiation
that provides the public functions.
 2014-03-26 04:31:27 -07:00
Diego Biurrun
55d7f26e7b hpeldsp_template: Move content to hpeldsp 
There is no point in having this separate; it is not used as a template.
 2014-03-26 04:31:27 -07:00
Diego Biurrun
09d4389de1 hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions 2014-03-26 04:31:27 -07:00
Diego Biurrun
92ba965103 dsputil: Move draw_edges and clear_block* out of dsputil_template 
The functions are not used templatized.
 2014-03-26 04:31:27 -07:00
Diego Biurrun
da5be23525 dsputil: Move RV40-specific bits into rv40dsp 2014-03-26 04:31:27 -07:00
Diego Biurrun
8011ac911b hpeldsp_template: Detemplatize the code 
The indirection makes no sense without multiple instantiation.
 2014-03-26 04:31:27 -07:00
Diego Biurrun
2c01ad8b20 dsputil_template: Detemplatize the code 
The indirection makes no sense without multiple instantiation.
 2014-03-26 04:31:27 -07:00
Diego Biurrun
aba70bb538 Add missing headers to make template files compile (more) standalone 2014-03-26 04:31:27 -07:00
Diego Biurrun
e7373585f8 dsputil_template: Move bits that are used templatized into separate file 
This allows detemplatizing the bits that are not instantiated twice.
 2014-03-26 04:31:27 -07:00
Diego Biurrun
d3c3c1664a dsputil: Move hpel_template #include out of dsputil_template 
Multiple inclusion makes no sense as it is only used in the 8-bit case.
 2014-03-26 04:31:26 -07:00
Diego Biurrun
d0aabeab23 x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation 
This fixes FATE with mmxext CPUFLAGS set.
 2014-03-26 12:00:01 +01:00
Michael Niedermayer
c05065aac0 avcodec/h261: move b_stride/b_xy under the if() where they are used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-26 04:22:39 +01:00
Michael Niedermayer
6795dcfa65 avcodec/hevc: Export picture type 
This only uses the first slice, improvement here is welcome
analyzing all slices the trivial way would interfere with threads

Fixes Ticket3185

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-26 04:20:52 +01:00
Michael Niedermayer
4090d5baa8 avcodec/h261dec: fix motion vector vissualization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-26 01:12:03 +01:00
Michael Niedermayer
8f20e3d4df Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: add missing includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 19:39:00 +01:00
Michael Niedermayer
41e7e46cac Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc' 
* commit 'aa499568afc01d59215eef7e5b14b949a9671afc':
  avconv: More descriptive message about framedrop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 19:25:10 +01:00
Michael Niedermayer
10e931d514 Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3' 
* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
  vf_transpose: K&R formatting cosmetics

Conflicts:
	libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 19:17:38 +01:00
James Almer
2d9821a208 x86/cpu: check for OS support before enabling AVX2 
AV_CPU_FLAG_AVX is enabled at this point only if there's OS support.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 17:56:43 +01:00
rogerdpack
4d9881e1cc udp: mention default in documentation 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 17:53:14 +01:00
rogerdpack
10056bc964 dshow: log error and continue if unable to set audio buffer 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 17:32:39 +01:00
Carl Eugen Hoyos
0816abae1e Add an .oga muxer. 2014-03-25 15:47:55 +01:00
Carl Eugen Hoyos
e6fe804bdd Do not set swscale sizeFactor to -1. 
Fixes ticket #3495.
 2014-03-25 15:46:35 +01:00
Øyvind Kolås
3e6016622e swscale: add two spatially stable dithering methods 
Both of these dithering methods are from http://pippin.gimp.org/a_dither/ for
GIF they can be considered better than bayer (provides more gray-levels), and
spatial stability - often more than twice as good compression and less visual
flicker than error diffusion methods (the methods also avoids error-shadow
artifacts of diffusion dithers).

These methods are similar to blue/green noise type dither masks; but are
simple enough to generate their mask on the fly. They are still research work
in progress; though more expensive to generate masks (which can be used in a
LUT) like 'void and cluster' and similar methods will yield superior results
 2014-03-25 13:48:06 +01:00
Peter Ross
a490970af2 libavcodec/*/vp8dsp_init: indent 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 13:29:29 +01:00
Peter Ross
4a031ce3c6 avformat/riff: add On2 VP7 fourccs 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 13:29:29 +01:00
Peter Ross
89f2f5dbd7 On2 VP7 decoder 
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 13:29:05 +01:00
Peter Ross
7d4c0220f1 avcodec/vp8: vp8_find_free_buffer 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 13:11:38 +01:00
Vittorio Giovara
dc0c70e018 avcodec: add missing includes 2014-03-25 12:28:22 +01:00
Vittorio Giovara
aa499568af avconv: More descriptive message about framedrop 2014-03-25 12:26:24 +01:00
Vittorio Giovara
6ee55c7b11 vf_transpose: K&R formatting cosmetics 2014-03-25 12:24:39 +01:00
Michael Niedermayer
a81ee2651f avcodec/svq1enc: fix undefined pointer operation 
Fixes Ticket3152

This also removes the dependance on ff_init_block_index/ff_update_block_index()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 03:34:00 +01:00
Michael Niedermayer
c25d2cd20b avcodec/x86/mpegvideoenc_template: fix integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 00:15:52 +01:00
Michael Niedermayer
575b957758 dox/scaler:fix bicubiclin typo 
See Ticket3486

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 22:04:52 +01:00
Michael Niedermayer
5d39ec2188 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx265: Only use one memcpy for headers

See: ecb5b9c098
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 21:24:55 +01:00
Michael Niedermayer
fc2de9b7cf Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed' 
* commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed':
  libx265: Write global extradata when requested

See: dded5ed9c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 21:08:45 +01:00
Michael Niedermayer
ab8d9fe9b8 Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834' 
* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
  build: Add config option for CABAC code

Conflicts:
	configure
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 20:55:23 +01:00
Michael Niedermayer
bce2abc936 avcodec/h264: use ff_h264_set_erpic() instead of memset 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 20:09:19 +01:00
Michael Niedermayer
cb640eb335 ffmpeg: move packet deallocation into write_frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 19:50:39 +01:00
Michael Niedermayer
33a7e288ab Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: don't warn on multiple frames per packet for codecs that expect it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 16:46:06 +01:00
Michael Niedermayer
1046cd60d4 Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e' 
* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
  avconv: print verbose per-stream transcoding statistics

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 16:40:35 +01:00
Michael Niedermayer
afa442c198 Merge commit 'a220b07b0f971f88213aef012aea51af2800be62' 
* commit 'a220b07b0f971f88213aef012aea51af2800be62':
  avconv: split printing the final statistics into a separate function

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 16:30:29 +01:00
Derek Buitenhuis
ecb5b9c098 libx265: Only use one memcpy for headers 
They're guaranteed by the x265 API to be contiguous in memory.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-03-24 15:28:20 +00:00
Derek Buitenhuis
206d5330f6 libx265: Simple cosmetic fix 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-03-24 15:28:11 +00:00
Derek Buitenhuis
21a561176e libx265: Only use one memcpy for headers 
They're guaranteed by the x265 API to be contiguous in memory.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-03-24 15:27:41 +00:00
Michael Niedermayer
60728e8bab libx265: Write global extradata when requested 
Matroska, MP4, and other containers require it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-24 15:27:41 +00:00
Michael Niedermayer
13278b97ae Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2' 
* commit 'baeb59d89beda499688e528c6a269d2b255b66f2':
  avconv: rewrite output data size tracking

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-24 16:11:13 +01:00