6ae4372532
h264/mpegvideo: fix ff_print_debug_info2 arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 11:06:35 +01:00
a76ef998eb
mpegvideo: move ff_print_debug_info2 to where ff_print_debug_info is
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 10:51:03 +01:00
b91459e565
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>
2013-03-12 10:41:09 +01:00
c48828f763
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>
2013-03-12 10:41:02 +01:00
c536253854
snow: set frame defaults
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 10:35:51 +01:00
b5e5ed8ea7
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>
2013-03-12 03:54:40 +01:00
01a0283c92
h264: disallow single unpaired fields as references of frames
...
Fixes deadlock
2013-03-12 03:23:58 +01:00
c69acbf881
lavfi/moviesrc: use refcounted frames
2013-03-12 03:23:57 +01:00
0fc01ae33c
h264: fix null pointer dereference and assertion failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 03:23:56 +01:00
ee3c3dd523
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
2013-03-12 03:23:55 +01:00
9e73f6d1f9
mpegvideo: dont allow last == current
...
this fixes deadlocks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 03:23:53 +01:00
9dd0b7ad82
update_frame_pool: use channel field
...
Fix memory corruption
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 03:23:51 +01:00
80e9e63c94
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>
2013-03-12 03:23:28 +01:00
2e7bc9c2a1
snowdec: fix off by 1 error in dimensions check
...
fixes infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 02:42:50 +01:00
73b40e2eb6
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.
2013-03-11 19:00:49 +01:00
0a7c4daf46
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
2013-03-11 18:22:45 +01:00
d6ed604cf4
lavc: remove disabled FF_API_IDCT cruft
2013-03-11 18:22:37 +01:00
3bcdf8dcb9
lavc: remove disabled FF_API_SNOW cruft
2013-03-11 18:22:26 +01:00
fcb07e8b33
lavc: remove disabled FF_API_MMI cruft
2013-03-11 18:22:18 +01:00
de27d2b92f
lavc: remove disabled FF_API_LIBMPEG2 cruft
2013-03-11 18:21:54 +01:00
0517c9e098
lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft
2013-03-11 18:21:32 +01:00
d6d369bf13
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>
2013-03-11 16:57:25 +02:00
fc8406d01e
avframe: copy reordered_opaque in copy_props
...
Fixes video playback in applications still using reordered_opaque.
2013-03-11 13:29:39 +01:00
1123080d2e
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
2013-03-11 03:55:23 +01:00
684e3d2e1c
ra144: check buffer size before requesting a buffer
...
Return an error on incomplete frames.
2013-03-10 22:34:43 +01:00
08149b2b39
wmapro: unref skipped frames
2013-03-10 22:34:43 +01:00
e3232f3431
svq1: use av_frame_free to free refcounted frame
...
Fixes a memleak due to avcodec_free_frame not freeing the frame data.
2013-03-10 22:28:18 +01:00
98cec5c84f
ratecontrol: remove an unused variable
2013-03-10 22:19:52 +01:00
669cc0f364
lavc: fix get_buffer() compatibility layer for audio.
...
planes - FF_ARRAY_ELEMS would be evaluated as unsigned and underflow
instead of being negative as was intended.
2013-03-10 22:19:52 +01:00
e2c2974120
vorbisdec: do not leak the first frame.
2013-03-10 22:16:26 +01:00
de54a96aa8
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 a2cd9be212
2013-03-10 19:39:25 +01:00
b71db3f38e
lavfi/buffersrc: do not dereference NULL frame.
...
frame = NULL is used to indicate EOF.
2013-03-10 17:05:55 +01:00
03b87fe5e3
lavfi: rename sink_buffer.c into buffersink.c.
2013-03-10 17:05:55 +01:00
3add5dc88e
lavfi: remove buffersink.c.
...
It only contains merge conflicts leftovers.
The real code is in sink_buffer.c.
2013-03-10 17:05:55 +01:00
fa41f7ecd6
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.
2013-03-10 17:05:46 +01:00
35135a3989
lavfi/smartblur: add support to named options
2013-03-10 16:38:45 +01:00
fb14e37dd0
ffmpeg: re-enable use of buffersrc flags.
...
AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
2013-03-10 14:07:29 +01:00
b0012de420
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.
2013-03-10 13:56:17 +01:00
cb2bd91413
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.
2013-03-10 13:48:49 +01:00
f9b34b8bf9
ffmpeg: port sub2video to AVFrame.
...
And re-enable the FATE test.
2013-03-10 13:45:15 +01:00
f185a040b0
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.
2013-03-10 13:22:59 +01:00
a2a848406f
cmdutils: clarify log message, in case of option routed to both codec and mux/demux layer
2013-03-10 13:22:59 +01:00
63edd2f989
cmdutils: remove duplicated check on CONFIG_POSTPROC
...
The check is already performed by the PRINT_LIB_INFO macro.
2013-03-10 13:22:59 +01:00
475c090af2
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.
2013-03-10 13:22:59 +01:00
daf6ea5d4e
cmdutils: fix stylenits
2013-03-10 13:22:59 +01:00
606efe18be
lavfi/unsharp: add missing option flags
2013-03-10 13:22:58 +01:00
dae76e8c47
lavc/utils: fix typo and reword message in case of too low bitrate
2013-03-10 13:22:58 +01:00
f963c77856
avfilter: avoid direct access to "frame"->channels
...
This avoids ABI issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10 11:25:54 +01:00
5d639b2b4a
vf_pad: fix a & instead of && typo
...
Avoid buffer overflow in buffer_needs_copy()
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-03-10 11:16:10 +01:00
91b747ac78
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>
2013-03-10 11:12:56 +01:00
Michael Niedermayer
Hendrik Leppkes
Martin Storsjö
Nicolas George
Anton Khirnov
Janne Grunau
Clément Bœsch
Stefano Sabatini
Xi Wang
Fabrizio Gennari