a303dce28c
utils: Dont sent fake channel layouts, 0 layout is better when its not known
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
f9fd6f983b
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>
12 years ago
a7f9d92a6d
Merge commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d'
...
* commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d':
lavc: limit maximum number of channels to 63
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
36685c3c4b
Merge commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca'
...
* commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca':
lavc: allow decoders to override frame parameters.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
64d11cb615
mss1: set frame defaults
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
80661e0f55
buffer: use the atomic get instead of the add and fetch variant.
12 years ago
1ad542f11f
get_video_buffer: add vertical padding
...
Fix memory corruption
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
53fd4f5594
avcodec: fix motion vector vissualization
...
was broken by the buffer ref stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
a4472ac01e
Add informative messages to av_log_ask_for_sample calls lacking them
12 years ago
6ae4372532
h264/mpegvideo: fix ff_print_debug_info2 arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
8f10f1a6dc
anm: Get rid of some very silly goto statements
12 years ago
a76ef998eb
mpegvideo: move ff_print_debug_info2 to where ff_print_debug_info is
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
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>
12 years ago
c536253854
snow: set frame defaults
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
01a0283c92
h264: disallow single unpaired fields as references of frames
...
Fixes deadlock
12 years ago
c69acbf881
lavfi/moviesrc: use refcounted frames
12 years ago
0fc01ae33c
h264: fix null pointer dereference and assertion failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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
12 years ago
9e73f6d1f9
mpegvideo: dont allow last == current
...
this fixes deadlocks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
9dd0b7ad82
update_frame_pool: use channel field
...
Fix memory corruption
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
2e7bc9c2a1
snowdec: fix off by 1 error in dimensions check
...
fixes infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
202c2acc40
vda: remove async decoder leftovers
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
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.
12 years ago
a2816230c5
avframe: call release_buffer only if it is set
...
AVCodecContext release_buffer() shall be NULL for audio codecs using
get_buffer. The backward compatibility code hence have to check before
calling it.
12 years ago
fce68c9355
pthread: unref the decoded but not returned frames on close.
...
Fixes memleaks when frame mt is used and the decoder is not flushed at
the end.
12 years ago
555000c7d5
h264: check that DPB is allocated before accessing it in flush_dpb()
12 years ago
d0a863ac89
vf_hqdn3d: fix uninitialized variable use
...
CC:libav-stable@libav.org
12 years ago
887d31d455
vf_gradfun: fix uninitialized variable use
...
CC:libav-stable@libav.org
12 years ago
c2597c5a0a
h264_refs: cosmetics, reformat
12 years ago
f08fefc4d0
h264: remove a useless svq3 condition
...
The svq3 decoder does not call ff_h264_frame_start() anymore.
12 years ago
07054015cf
mpegvideo: remove FMT_H264
12 years ago
ee8704916d
mpegvideo: reindent
12 years ago
19cac8e301
mpegvideo: remove useless references to h264 and svq3
...
The h264 decoder does not use mpegvideo anymore. The svq3 decoder only
uses ff_draw_horiz_band().
12 years ago
85a5bc054c
lavf: remove disabled FF_API_R_FRAME_RATE cruft
12 years ago
7b486ab13b
lavf: remove disabled FF_API_AV_GETTIME cruft
12 years ago
32e5194969
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
12 years ago
435c2a31ad
lavf: remove disabled FF_API_READ_PACKET cruft
12 years ago
c7e044c61b
lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
12 years ago
0a7c4daf46
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
12 years ago
d6ed604cf4
lavc: remove disabled FF_API_IDCT cruft
12 years ago
3bcdf8dcb9
lavc: remove disabled FF_API_SNOW cruft
12 years ago
fcb07e8b33
lavc: remove disabled FF_API_MMI cruft
12 years ago
de27d2b92f
lavc: remove disabled FF_API_LIBMPEG2 cruft
12 years ago
0517c9e098
lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft
12 years ago
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>
12 years ago
fc8406d01e
avframe: copy reordered_opaque in copy_props
...
Fixes video playback in applications still using reordered_opaque.
12 years ago
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
12 years ago
Michael Niedermayer
Clément Bœsch
Diego Biurrun
Hendrik Leppkes
Martin Storsjö
Luca Barbato
Nicolas George
Janne Grunau
Anton Khirnov