]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 12 Mar 2013 23:39:05 +0000 (00:39 +0100)]
avcodec: assert that old codec ids match new
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 23:48:58 +0000 (00:48 +0100)]
Merge commit '
bdd1567c355a8092e7746ef99e831d579e34fa6a '
* commit '
bdd1567c355a8092e7746ef99e831d579e34fa6a ':
lavc: remove disabled FF_API_CODEC_ID cruft
Conflicts:
libavcodec/old_codec_ids.h
libavcodec/version.h
Only the #define is removed
The CODEC_IDs itself are left until theres some reason to remove
them.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 10 Mar 2013 16:36:29 +0000 (17:36 +0100)]
lavfi/fieldorder: add support to named options
Stefano Sabatini [Sun, 10 Mar 2013 16:35:54 +0000 (17:35 +0100)]
lavfi/fieldorder: remove unused headers and commented define
Stefano Sabatini [Sun, 10 Mar 2013 15:15:48 +0000 (16:15 +0100)]
lavc: extend documentation for skip_idct, skip_loop_filter, skip_frame options
Stefano Sabatini [Wed, 6 Mar 2013 23:47:59 +0000 (00:47 +0100)]
ffprobe: support codec options
Make ffprobe honour codec options, and support stream specifiers like it
is done in ffplay.
In particular, address Trac ticket #1859.
Stefano Sabatini [Sun, 10 Mar 2013 14:36:20 +0000 (15:36 +0100)]
cmdutils: improve feedback in case of not found option
Nicolas George [Mon, 11 Mar 2013 20:51:05 +0000 (21:51 +0100)]
configure: remove selection of ff(a)buffersink.
buffersink is enabled unconditionally.
Nicolas George [Mon, 11 Mar 2013 20:49:28 +0000 (21:49 +0100)]
lavfi/buffersink: schedule removing the "ff" variants.
They are no longer needed since there is no incompatible
ABI version.
Nicolas George [Mon, 11 Mar 2013 20:49:04 +0000 (21:49 +0100)]
Remove references to the "ff" variant of buffersink.
Nicolas George [Mon, 11 Mar 2013 20:26:03 +0000 (21:26 +0100)]
lavfi/buffersink: rename filter structures.
Reduce the diff with the fork.
Michael Niedermayer [Tue, 12 Mar 2013 22:08:08 +0000 (23:08 +0100)]
Merge commit '
7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08 '
* commit '
7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08 ':
lavc: remove disabled FF_API_FIND_BEST_PIX_FMT cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 12 Mar 2013 14:28:12 +0000 (07:28 -0700)]
vp3/x86: use full transpose for all IDCTs.
This way, the special IDCT permutations are no longer needed. Bfin code
is disabled until someone updates it. This is similar to how H264 does
it, and removes the dsputil dependency imposed by the scantable code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 21:38:55 +0000 (22:38 +0100)]
Merge commit '
845017105f240ac5348aad1f8a5256b86d49db76 '
* commit '
845017105f240ac5348aad1f8a5256b86d49db76 ':
lavc: remove disabled FF_API_DSP_MASK cruft
lavc: remove disabled FF_API_SUB_ID cruft
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 21:18:08 +0000 (22:18 +0100)]
Merge commit '
2a113695238e7675ab75c5fb9a5f59fc92f2ddd9 '
* commit '
2a113695238e7675ab75c5fb9a5f59fc92f2ddd9 ':
lavc: remove disabled FF_API_INTER_THRESHOLD cruft
lavc: remove disabled FF_API_COLOR_TABLE_ID cruft
lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 21:04:16 +0000 (22:04 +0100)]
Merge commit '
0f24a3ca999a702f83af9307f9f47b6fdeb546a5 '
* commit '
0f24a3ca999a702f83af9307f9f47b6fdeb546a5 ':
lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft
Conflicts:
libavcodec/flacenc.c
libavcodec/libgsm.c
libavcodec/utils.c
libavcodec/version.h
The compatibility wrapers are left as they likely sre still
in wide use. They will be removed when they break or otherwise
cause work without an volunteer being available.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:46:38 +0000 (21:46 +0100)]
vp6: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:45:51 +0000 (21:45 +0100)]
Changelog: fix project name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:39:32 +0000 (21:39 +0100)]
Merge commit '
6327c10702922eabcb1c6170abd3f03d23ce4c51 '
* commit '
6327c10702922eabcb1c6170abd3f03d23ce4c51 ':
atomic: fix CAS with armcc.
png: use av_mallocz_array() for the zlib zalloc function
libmp3lame: use the correct remaining buffer size when flushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:26:13 +0000 (21:26 +0100)]
Merge commit '
666fe5da47d127074be7f0e2bac93db6af8b4a30 '
* commit '
666fe5da47d127074be7f0e2bac93db6af8b4a30 ':
atomic: Exclude the unsupported implementation headers from checkheaders
avconv: do not silently ignore unused codec AVOptions.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:23:54 +0000 (21:23 +0100)]
avfilter: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:15:18 +0000 (21:15 +0100)]
Merge commit '
db2d65ce1ed13ea9a530b1934963a16c3e8fa460 '
* commit '
db2d65ce1ed13ea9a530b1934963a16c3e8fa460 ':
avconv: fix a typo
FATE: replace -vb with -b:v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 20:06:30 +0000 (21:06 +0100)]
Merge commit '
6deae8e0530a885b76f149841ed4899cb438ec23 '
* commit '
6deae8e0530a885b76f149841ed4899cb438ec23 ':
FATE: remove the -dct option from some decoding tests.
avconv: use a local variable for InputFile in open_input_file().
Conflicts:
tests/fate/microsoft.mak
tests/fate/real.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 19:58:45 +0000 (20:58 +0100)]
Merge commit '
1da54e908eba73eb86f5d614c51f06811c85c3ea '
* commit '
1da54e908eba73eb86f5d614c51f06811c85c3ea ':
avconv: use a local variable for OutputFile in open_output_file().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 12 Mar 2013 19:33:13 +0000 (20:33 +0100)]
vorbis: unref the skipped first frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 12 Mar 2013 15:45:13 +0000 (16:45 +0100)]
avutil/os_support: use 64-bit fstat/lseek variants for MSVC as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 12 Mar 2013 14:28:11 +0000 (07:28 -0700)]
dsputil: make selectable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:58:10 +0000 (18:58 +0100)]
ffmpeg: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:43:17 +0000 (18:43 +0100)]
h264: show recovery SEIs in debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:30:59 +0000 (18:30 +0100)]
j2kdec: remove unused variable and empty function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 12 Mar 2013 16:02:57 +0000 (17:02 +0100)]
jv: initialize AVFrame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:18:56 +0000 (18:18 +0100)]
ffmpeg: fix reinit_filter type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 17:10:35 +0000 (18:10 +0100)]
Merge commit '
9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38 '
* commit '
9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38 ':
avconv: print an error on applying options of the wrong type.
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
output-example: Update to use encode_video2 instead of the now dropped encode_video
Conflicts:
doc/examples/muxing.c
ffmpeg_opt.c
libavutil/atomic.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 15:43:06 +0000 (16:43 +0100)]
pthread: fix unused variable warning
Giorgio Vazzana [Mon, 11 Mar 2013 15:39:52 +0000 (16:39 +0100)]
lavd/v4l2: fix bug in init_convert_timestamp()
The current code returned a period=0, resulting in identical pts for all frames
after time-filtering. This is because AV_TIME_BASE_Q={1, AV_TIME_BASE} and
not {AV_TIME_BASE, 1}. With this patch the correct period in microseconds is computed.
Michael Niedermayer [Tue, 12 Mar 2013 15:36:21 +0000 (16:36 +0100)]
Merge commit '
2240e92f052960693de55cf4924e80426dfaa965 '
* commit '
2240e92f052960693de55cf4924e80426dfaa965 ':
atomic: Add include guards to the implementation headers
lavc: update the fallback versions of ff_thread_*
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 15:31:21 +0000 (16:31 +0100)]
Merge commit '
19dd4017ab6dac11c77d797acebee4f60ad63a6f '
* commit '
19dd4017ab6dac11c77d797acebee4f60ad63a6f ':
libopencore-amr: Add the missing 3rd argument of ff_get_buffer()
vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
wmaprodec: return an error, not 0, when the input is too small.
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 12 Mar 2013 14:56:52 +0000 (15:56 +0100)]
lavf: add AV_ to two remaining CODEC_ID_*.
Michael Niedermayer [Tue, 12 Mar 2013 15:15:08 +0000 (16:15 +0100)]
Merge commit '
cacad1c058f66558ec727faac3b277d2dee264d4 '
* commit '
cacad1c058f66558ec727faac3b277d2dee264d4 ':
wmaprodec: require block_align to be set.
wmadec: require block_align to be set.
ivi_common: do not call MC for intra frames when dc_transform is unset
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 15:04:46 +0000 (16:04 +0100)]
xface: remove unused stuff, fix related warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:57:23 +0000 (15:57 +0100)]
Merge commit '
3e2f200237af977b9253b0aff121eee27bcedb44 '
* commit '
3e2f200237af977b9253b0aff121eee27bcedb44 ':
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
xxan: fix invalid memory access in xan_decode_frame_type0()
tty: set avg_frame_rate.
FATE: enable multiple slices in the ffv1 vsynth test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:51:22 +0000 (15:51 +0100)]
Merge commit '
d243896987b8b2062d1faba4d8d6f0c62d2dbee9 '
* commit '
d243896987b8b2062d1faba4d8d6f0c62d2dbee9 ':
ffv1: fix calculating slice dimensions for version 2
Conflicts:
libavcodec/ffv1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:44:15 +0000 (15:44 +0100)]
Merge commit '
7b89cd20d844cbe763ca34e63e99d110043cf241 '
* commit '
7b89cd20d844cbe763ca34e63e99d110043cf241 ':
eamad: allocate a dummy reference frame when the real one is missing
Replace remaining includes of audioconvert.h with channel_layout.h
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:29:20 +0000 (15:29 +0100)]
Merge commit '
d8b31be6caebd8d1321ecb754b6e7daaf81dc111 '
* commit '
d8b31be6caebd8d1321ecb754b6e7daaf81dc111 ':
Add the bumps and APIchanges entries for reference counted buffers changes.
Conflicts:
Changelog
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:26:35 +0000 (15:26 +0100)]
avformat: keep r_frame_rate
This field is used and nothing equivalent exists
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:25:59 +0000 (15:25 +0100)]
avformat/avdevice: add missing time.h includes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 14:25:21 +0000 (15:25 +0100)]
avcodec: postpone removial of parts still used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 13:46:29 +0000 (14:46 +0100)]
Merge commit '
8df23e938b4022d6e6e9e1180ea6418abae74fda '
* commit '
8df23e938b4022d6e6e9e1180ea6418abae74fda ':
lavc: postpone the removal of request_channels API.
AVFrame: deprecate all now unused fields
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 13:27:45 +0000 (14:27 +0100)]
Merge commit '
ddcca4ba074aa537c3059c76d69eb4ad6316bfe9 '
* commit '
ddcca4ba074aa537c3059c76d69eb4ad6316bfe9 ':
lavc: stop setting AVFrame.motion_subsample_log2
avserver: don't set deprecated options.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 12:40:42 +0000 (13:40 +0100)]
Merge commit '
354468fc12dcf93e7fb4af552e18906771913273 '
* commit '
354468fc12dcf93e7fb4af552e18906771913273 ':
avplay: switch to new refcounted frames API
avconv: convert to new refcounted AVFrame API
Conflicts:
cmdutils.c
ffmpeg.c
ffmpeg.h
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:57:54 +0000 (12:57 +0100)]
Merge commit '
37045e422903695e610cca6ecb753df643ab9380 '
* commit '
37045e422903695e610cca6ecb753df643ab9380 ':
mpegvideo: drop vismv code
Conflicts:
libavcodec/mpegvideo.c
vismv code works fine, and thus only the unused fields are droped
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:42:27 +0000 (12:42 +0100)]
utils: Dont sent fake channel layouts, 0 layout is better when its not known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:41:16 +0000 (12:41 +0100)]
Merge commit '
2eba9087f3031c6050f8dcd996225490be6c2410 '
* commit '
2eba9087f3031c6050f8dcd996225490be6c2410 ':
lavc: make up a fake frame channel layout when there is no real one.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:23:04 +0000 (12:23 +0100)]
Merge commit '
192f1984b1a93aa08af053b8f9ab4950f307bd5d '
* commit '
192f1984b1a93aa08af053b8f9ab4950f307bd5d ':
lavc: limit maximum number of channels to 63
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:18:31 +0000 (12:18 +0100)]
Merge commit '
15ec0450b4ae891f3e6ababa03c777a4443b94ca '
* commit '
15ec0450b4ae891f3e6ababa03c777a4443b94ca ':
lavc: allow decoders to override frame parameters.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 11:11:50 +0000 (12:11 +0100)]
mss1: set frame defaults
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 12 Mar 2013 07:31:28 +0000 (08:31 +0100)]
buffer: use the atomic get instead of the add and fetch variant.
Michael Niedermayer [Tue, 12 Mar 2013 10:33:43 +0000 (11:33 +0100)]
get_video_buffer: add vertical padding
Fix memory corruption
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 10:23:07 +0000 (11:23 +0100)]
avcodec: fix motion vector vissualization
was broken by the buffer ref stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 10:06:35 +0000 (11:06 +0100)]
h264/mpegvideo: fix ff_print_debug_info2 arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 09:51:03 +0000 (10:51 +0100)]
mpegvideo: move ff_print_debug_info2 to where ff_print_debug_info is
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sun, 10 Mar 2013 22:03:42 +0000 (23:03 +0100)]
atomic: prefer gcc builtins over win32 atomics, if available.
The mingw win32 atomics appear to be faulty, so they should not be used
if the gcc ones are available.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 8 Mar 2013 10:32:38 +0000 (12:32 +0200)]
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
Not all gcc configurations have an implementation of all the atomic
operations, and some gcc configurations have some atomic builtins
implemented but not all.
Thus check for the most essential function, whose presence should
indicate that all others are present as well, since it can be used
to implement all the other ones.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 12 Mar 2013 03:29:00 +0000 (04:29 +0100)]
snow: set frame defaults
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 02:51:59 +0000 (03:51 +0100)]
Merge commit '
3b199d29cd597a3518136d78860e172060b9e83d '
* commit '
3b199d29cd597a3518136d78860e172060b9e83d ':
lavc decoders: properly initialize AVFrame.
Conflicts:
libavcodec/avs.c
libavcodec/c93.c
libavcodec/cinepak.c
libavcodec/flashsv.c
libavcodec/flicvideo.c
libavcodec/iff.c
libavcodec/mmvideo.c
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/qtrle.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 01:08:06 +0000 (02:08 +0100)]
h264: disallow single unpaired fields as references of frames
Fixes deadlock
Hendrik Leppkes [Mon, 11 Mar 2013 22:28:56 +0000 (23:28 +0100)]
lavfi/moviesrc: use refcounted frames
Michael Niedermayer [Mon, 11 Mar 2013 21:11:51 +0000 (22:11 +0100)]
h264: fix null pointer dereference and assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Mar 2013 20:29:14 +0000 (21:29 +0100)]
ff_alloc_picture: free tables in case of dimension mismatches
Fixes memory corruption
In theory this should not be needed but its better to check at
one place than to hope 50 other places set the flags correctly
Michael Niedermayer [Mon, 11 Mar 2013 19:19:34 +0000 (20:19 +0100)]
mpegvideo: dont allow last == current
this fixes deadlocks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Mar 2013 16:18:46 +0000 (17:18 +0100)]
update_frame_pool: use channel field
Fix memory corruption
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Mar 2013 02:20:18 +0000 (03:20 +0100)]
Merge commit '
759001c534287a96dc96d1e274665feb7059145d '
* commit '
759001c534287a96dc96d1e274665feb7059145d ':
lavc decoders: work with refcounted frames.
Anton Khirnov (1):
lavc decoders: work with refcounted frames.
Clément Bœsch (47):
lavc/ansi: reset file
lavc/ansi: re-do refcounted frame changes from Anton
fraps: reset file
lavc/fraps: switch to refcounted frames
gifdec: reset file
lavc/gifdec: switch to refcounted frames
dsicinav: resolve conflicts
smc: resolve conflicts
zmbv: resolve conflicts
rpza: resolve conflicts
vble: resolve conflicts
xxan: resolve conflicts
targa: resolve conflicts
vmnc: resolve conflicts
utvideodec: resolve conflicts
tscc: resolve conflicts
ulti: resolve conflicts
ffv1dec: resolve conflicts
dnxhddec: resolve conflicts
v210dec: resolve conflicts
vp3: resolve conflicts
vcr1: resolve conflicts
v210x: resolve conflicts
wavpack: resolve conflicts
pngdec: fix compilation
roqvideodec: resolve conflicts
pictordec: resolve conflicts
mdec: resolve conflicts
tiertexseqv: resolve conflicts
smacker: resolve conflicts
vb: resolve conflicts
vqavideo: resolve conflicts
xl: resolve conflicts
tmv: resolve conflicts
vmdav: resolve conflicts
truemotion1: resolve conflicts
truemotion2: resolve conflicts
lcldec: fix compilation
libcelt_dec: fix compilation
qdrw: fix compilation
r210dec: fix compilation
rl2: fix compilation
wnv1: fix compilation
yop: fix compilation
tiff: resolve conflicts
interplayvideo: fix compilation
qpeg: resolve conflicts (FIXME/TESTME).
Hendrik Leppkes (33):
012v: convert to refcounted frames
8bps: fix compilation
8svx: resolve conflicts
4xm: resolve conflicts
aasc: resolve conflicts
bfi: fix compilation
aura: fix compilation
alsdec: resolve conflicts
avrndec: convert to refcounted frames
avuidec: convert to refcounted frames
bintext: convert to refcounted frames
cavsdec: resolve conflicts
brender_pix: convert to refcounted frames
cinepak: resolve conflicts
cinepak: avoid using AVFrame struct directly in private context
cljr: fix compilation
cpia: convert to refcounted frames
cscd: resolve conflicts
iff: resolve conflicts and do proper conversion to refcounted frames
4xm: fix reference frame handling
cyuv: fix compilation
dxa: fix compilation
eacmv: fix compilation
eamad: fix compilation
eatgv: fix compilation
escape124: remove unused variable.
escape130: convert to refcounted frames
evrcdec: convert to refcounted frames
exr: convert to refcounted frames
mvcdec: convert to refcounted frames
paf: properly free the frame data on decode close
sgirle: convert to refcounted frames
lavfi/moviesrc: use refcounted frames
Michael Niedermayer (56):
Merge commit '
759001c534287a96dc96d1e274665feb7059145d '
resolve conflicts in headers
motion_est: resolve conflict
mpeg4videodec: fix conflicts
dpcm conflict fix
dpx: fix conflicts
indeo3: resolve confilcts
kmvc: resolve conflicts
kmvc: resolve conflicts
h264: resolve conflicts
utils: resolve conflicts
rawdec: resolve conflcits
mpegvideo: resolve conflicts
svq1enc: resolve conflicts
mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
pthreads: resolve conflicts
frame_thread_encoder: simple compilefix not yet tested
snow: update to buffer refs
crytsalhd: fix compile
dirac: switch to new API
sonic: update to new API
svq1: resolve conflict, update to new API
ffwavesynth: update to new buffer API
g729: update to new API
indeo5: fix compile
j2kdec: update to new buffer API
linopencore-amr: fix compile
libvorbisdec: update to new API
loco: fix compile
paf: update to new API
proresdec: update to new API
vp56: update to new api / resolve conflicts
xface: convert to refcounted frames
xan: fix compile&fate
v408: update to ref counted buffers
v308: update to ref counted buffers
yuv4dec: update to ref counted buffers
y41p: update to ref counted frames
xbm: update to refcounted frames
targa_y216: update to refcounted buffers
qpeg: fix fate/crash
cdxl: fix fate
tscc: fix reget buffer useage
targa_y216dec: fix style
msmpeg4: fix fate
h264: ref_picture() copy fields that have been lost too
update_frame_pool: use channel field
h264: Put code that prevents deadlocks back
mpegvideo: dont allow last == current
wmalossless: fix buffer ref messup
ff_alloc_picture: free tables in case of dimension mismatches
h264: fix null pointer dereference and assertion failure
frame_thread_encoder: update to bufrefs
ec: fix used arrays
snowdec: fix off by 1 error in dimensions check
h264: disallow single unpaired fields as references of frames
Paul B Mahol (2):
lavc/vima: convert to refcounted frames
sanm: convert to refcounted frames
Conflicts:
libavcodec/4xm.c
libavcodec/8bps.c
libavcodec/8svx.c
libavcodec/aasc.c
libavcodec/alsdec.c
libavcodec/anm.c
libavcodec/ansi.c
libavcodec/avs.c
libavcodec/bethsoftvideo.c
libavcodec/bfi.c
libavcodec/c93.c
libavcodec/cavsdec.c
libavcodec/cdgraphics.c
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/dsicinav.c
libavcodec/dvdec.c
libavcodec/dxa.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/eatqi.c
libavcodec/error_resilience.c
libavcodec/escape124.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/flicvideo.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/huffyuvdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/ivi_common.c
libavcodec/jvdec.c
libavcodec/kgv1dec.c
libavcodec/kmvc.c
libavcodec/lagarith.c
libavcodec/libopenjpegdec.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mmvideo.c
libavcodec/motion_est.c
libavcodec/motionpixels.c
libavcodec/mpc7.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/nuv.c
libavcodec/options_table.h
libavcodec/pcx.c
libavcodec/pictordec.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/pthread.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/r210dec.c
libavcodec/rawdec.c
libavcodec/roqvideodec.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavcodec/targa.c
libavcodec/tiertexseqv.c
libavcodec/tiff.c
libavcodec/tmv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
libavcodec/tscc.c
libavcodec/ulti.c
libavcodec/utils.c
libavcodec/utvideodec.c
libavcodec/v210dec.c
libavcodec/v210x.c
libavcodec/vb.c
libavcodec/vble.c
libavcodec/vcr1.c
libavcodec/vmdav.c
libavcodec/vmnc.c
libavcodec/vp3.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp6.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/zmbv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Mar 2013 23:28:08 +0000 (00:28 +0100)]
snowdec: fix off by 1 error in dimensions check
fixes infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 10 Mar 2013 18:59:48 +0000 (19:59 +0100)]
lavfi/buffersink: move the filter structures at the end.
Also apply a few cosmetic fixes (spaces, trailing comma) to
help match them with the fork's implementation.
Clément Bœsch [Mon, 11 Mar 2013 02:55:08 +0000 (03:55 +0100)]
cmdutils: remove conditionnal pp include.
The definition of the include are needed for builds even without pp.
This should fix FATE with --disable-gpl after
63edd2f9 .
Nicolas George [Sun, 10 Mar 2013 15:44:46 +0000 (16:44 +0100)]
lavfi/buffersink: implement av_buffersink_get_samples().
Note: the implementation could be more efficient, but at
the cost of more diff.
Most of the code from the following commit:
commit
a2cd9be212fca02dd3d6ee65cb6ab9f84c5e28e5
Author: Anton Khirnov <anton@khirnov.net>
Date: Fri May 4 19:22:38 2012 +0200
lavfi: add an audio buffer sink.
Adapted to call av_buffersink_get_frame_flags() instead of
accessing the frame directly.
Nicolas George [Sun, 10 Mar 2013 15:28:33 +0000 (16:28 +0100)]
lavfi/buffersrc: do not dereference NULL frame.
frame = NULL is used to indicate EOF.
Nicolas George [Sun, 10 Mar 2013 15:01:12 +0000 (16:01 +0100)]
lavfi: rename sink_buffer.c into buffersink.c.
Nicolas George [Sun, 10 Mar 2013 14:57:43 +0000 (15:57 +0100)]
lavfi: remove buffersink.c.
It only contains merge conflicts leftovers.
The real code is in sink_buffer.c.
Nicolas George [Sun, 10 Mar 2013 14:55:33 +0000 (15:55 +0100)]
lavfi/sink_buffer: move stuff to reduce the diff.
Note: av_buffersink_get_samples() is not yet implemented,
abuffersink is not yet a drop-in replacement of the fork's
abuffersink.
Stefano Sabatini [Sun, 10 Mar 2013 12:13:10 +0000 (13:13 +0100)]
lavfi/smartblur: add support to named options
Nicolas George [Sun, 10 Mar 2013 13:07:29 +0000 (14:07 +0100)]
ffmpeg: re-enable use of buffersrc flags.
AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
Nicolas George [Sun, 10 Mar 2013 12:33:18 +0000 (13:33 +0100)]
lavfi/buffersrc: implement flags.
The PUSH flags is necessary for efficient scheduling;
otherwise there is no feedback when adding frames to
closed paths.
The NO_CHECK_FORMAT is a small optimization that does
not cost much to implement.
The KEEP_REF flag maps to the add/write distinction in
the fork's API.
Nicolas George [Wed, 27 Feb 2013 20:14:48 +0000 (21:14 +0100)]
ffmpeg: add the -canvas_size option.
Allows, amongst other things, to override the size guessed
by the sub2video hack.
Note: the -s option could have more or less the same semantic,
but it receives a special treatment by the options system.
Nicolas George [Sun, 10 Mar 2013 10:51:02 +0000 (11:51 +0100)]
ffmpeg: port sub2video to AVFrame.
And re-enable the FATE test.
Stefano Sabatini [Sun, 10 Mar 2013 10:51:00 +0000 (11:51 +0100)]
doc/ffplay,ffmpeg: mention the corresponding negated option for -stats
This helps lazy users who didn't read the part about boolean options, in
case they grep for "-nostats".
-stdin and -stats are the only booleans option enabled by default. This
is a partial fix for Trac ticket #2332, a complete overhaul of boolean
options documentation is probably overkill.
Stefano Sabatini [Sun, 10 Mar 2013 10:05:32 +0000 (11:05 +0100)]
cmdutils: clarify log message, in case of option routed to both codec and mux/demux layer
Stefano Sabatini [Sun, 10 Mar 2013 11:02:24 +0000 (12:02 +0100)]
cmdutils: remove duplicated check on CONFIG_POSTPROC
The check is already performed by the PRINT_LIB_INFO macro.
Stefano Sabatini [Sun, 10 Mar 2013 10:48:11 +0000 (11:48 +0100)]
cmdutils: make print_all_libs_info() show libavresample version
Even if not directly supported by FFmpeg, it is still useful to see the
linked version of libavresample.
Stefano Sabatini [Sun, 10 Mar 2013 10:04:24 +0000 (11:04 +0100)]
cmdutils: fix stylenits
Stefano Sabatini [Sun, 10 Mar 2013 12:20:44 +0000 (13:20 +0100)]
lavfi/unsharp: add missing option flags
Stefano Sabatini [Fri, 8 Mar 2013 22:39:50 +0000 (23:39 +0100)]
lavc/utils: fix typo and reword message in case of too low bitrate
Michael Niedermayer [Sun, 10 Mar 2013 10:20:07 +0000 (11:20 +0100)]
avfilter: avoid direct access to "frame"->channels
This avoids ABI issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fabrizio Gennari [Sun, 10 Mar 2013 09:22:45 +0000 (10:22 +0100)]
mem: Fix usage of memalign() on DJGPP.
Credits to Khusraw of bttr-software.de forum.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Xi Wang [Sun, 10 Mar 2013 03:39:32 +0000 (22:39 -0500)]
lavfi/pad: avoid buffer overflow in buffer_needs_copy()
Replace & with short-circuit &&.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Clément Bœsch [Mon, 4 Mar 2013 15:06:14 +0000 (16:06 +0100)]
lavfi: add curves filter.
Clément Bœsch [Sun, 10 Mar 2013 01:59:43 +0000 (02:59 +0100)]
lavfi: bump minor version after the first round of evil changes.
Michael Niedermayer [Sun, 10 Mar 2013 01:52:15 +0000 (02:52 +0100)]
sink_buffer: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 9 Mar 2013 17:08:36 +0000 (09:08 -0800)]
vp3: embed idct_permutation array directly in VP3DecoderContext.
This makes the vp3 decoder less dependent on dsputil, and will aid
in making it (eventually) dsputil-independent.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 10 Mar 2013 01:32:35 +0000 (02:32 +0100)]
lavfi: remove remaining forgotten min/rej perms.