FFmpeg

Commit Graph

Author	SHA1	Message	Date
Michael Niedermayer	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
Michael Niedermayer	01a0283c92	h264: disallow single unpaired fields as references of frames Fixes deadlock	12 years ago
Hendrik Leppkes	c69acbf881	lavfi/moviesrc: use refcounted frames	12 years ago
Michael Niedermayer	0fc01ae33c	h264: fix null pointer dereference and assertion failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	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
Michael Niedermayer	9e73f6d1f9	mpegvideo: dont allow last == current this fixes deadlocks Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	9dd0b7ad82	update_frame_pool: use channel field Fix memory corruption Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	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
Michael Niedermayer	2e7bc9c2a1	snowdec: fix off by 1 error in dimensions check fixes infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Nicolas George	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
Clément Bœsch	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
Nicolas George	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` 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.	12 years ago
Nicolas George	b71db3f38e	lavfi/buffersrc: do not dereference NULL frame. frame = NULL is used to indicate EOF.	12 years ago
Nicolas George	03b87fe5e3	lavfi: rename sink_buffer.c into buffersink.c.	12 years ago
Nicolas George	3add5dc88e	lavfi: remove buffersink.c. It only contains merge conflicts leftovers. The real code is in sink_buffer.c.	12 years ago
Nicolas George	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.	12 years ago
Stefano Sabatini	35135a3989	lavfi/smartblur: add support to named options	12 years ago
Nicolas George	fb14e37dd0	ffmpeg: re-enable use of buffersrc flags. AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.	12 years ago
Nicolas George	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.	12 years ago
Nicolas George	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.	12 years ago
Nicolas George	f9b34b8bf9	ffmpeg: port sub2video to AVFrame. And re-enable the FATE test.	12 years ago
Stefano Sabatini	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.	12 years ago
Stefano Sabatini	a2a848406f	cmdutils: clarify log message, in case of option routed to both codec and mux/demux layer	12 years ago
Stefano Sabatini	63edd2f989	cmdutils: remove duplicated check on CONFIG_POSTPROC The check is already performed by the PRINT_LIB_INFO macro.	12 years ago
Stefano Sabatini	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.	12 years ago
Stefano Sabatini	daf6ea5d4e	cmdutils: fix stylenits	12 years ago
Stefano Sabatini	606efe18be	lavfi/unsharp: add missing option flags	12 years ago
Stefano Sabatini	dae76e8c47	lavc/utils: fix typo and reword message in case of too low bitrate	12 years ago
Michael Niedermayer	f963c77856	avfilter: avoid direct access to "frame"->channels This avoids ABI issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Fabrizio Gennari	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>	12 years ago
Xi Wang	969e8d35b5	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>	12 years ago
Clément Bœsch	65fc80f012	lavfi: add curves filter.	12 years ago
Clément Bœsch	3d813e7ec3	lavfi: bump minor version after the first round of evil changes.	12 years ago
Michael Niedermayer	108434a30c	sink_buffer: remove unused variables Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Ronald S. Bultje	d5efa84f13	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>	12 years ago
Clément Bœsch	96e4b00d62	lavfi: remove remaining forgotten min/rej perms.	12 years ago
Michael Niedermayer	806a66fd08	mpegts: clear avprograms only for removed programs Fixes Ticket2186 Requested-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	07ab8d3369	Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Revert "build: disable iconv by default." Merged-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Clément Bœsch	f0a5f71074	lavfi/hue: reindent.	12 years ago
Clément Bœsch	3da54858d3	lavfi/hue: add an optimized direct path.	12 years ago
Michael Niedermayer	4a62f477ea	Merge commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827' * commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827': mpegvideo_enc: drop support for reusing the input motion vectors. Conflicts: libavcodec/motion_est.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Clément Bœsch	e53061154f	lavu/frame: fix not/note typo in doxy.	12 years ago
Clément Bœsch	5e4bc96415	doc: fix examples.	12 years ago
Michael Niedermayer	b1b506bc56	fate: disable sub2video Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Nicolas George	4e7c61b7a7	ffmpeg: do not give away our reference to the frame. Note: the logic here is temporary until the updates to ffmpeg.c are merged.	12 years ago
Nicolas George	9cc02101ff	lavc/rawdec: set field order on decoded frame.	12 years ago
Nicolas George	6184fa2067	rawdec: work with refcounted frames. Adapted from commit `759001c534` by Anton Khirnov. Also, fix the use of \|\| instead of \| in a flags check.	12 years ago
Michael Niedermayer	a05a44e205	Merge commit '7e350379f87e7f74420b4813170fe808e2313911' * commit '7e350379f87e7f74420b4813170fe808e2313911': lavfi: switch to AVFrame. Conflicts: doc/filters.texi libavfilter/af_ashowinfo.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.c libavfilter/buffersrc.c libavfilter/buffersrc.h libavfilter/f_select.c libavfilter/f_setpts.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/version.h libavfilter/vf_aspect.c libavfilter/vf_bbox.c libavfilter/vf_blackframe.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hqdn3d.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavfilter/yadif.h Following are notes about the merge authorship and various technical details. Michael Niedermayer: * Main merge operation, notably avfilter.c and video.c * Switch to AVFrame: - afade - anullsrc - apad - aresample - blackframe - deshake - idet - il - mandelbrot - mptestsrc - noise - setfield - smartblur - tinterlace * various merge changes and fixes in: - ashowinfo - blackdetect - field - fps - select - testsrc - yadif Nicolas George: * Switch to AVFrame: - make rawdec work with refcounted frames. Adapted from commit `759001c534` by Anton Khirnov. Also, fix the use of \|\| instead of \| in a flags check. - make buffer sink and src, audio and video work all together Clément Bœsch: * Switch to AVFrame: - aevalsrc - alphaextract - blend - cellauto - colormatrix - concat - earwax - ebur128 - edgedetect - geq - histeq - histogram - hue - kerndeint - life - movie - mp (with the help of Michael) - overlay - pad - pan - pp - pp - removelogo - sendcmd - showspectrum - showwaves - silencedetect - stereo3d - subtitles - super2xsai - swapuv - thumbnail - tile Hendrik Leppkes: * Switch to AVFrame: - aconvert - amerge - asetnsamples - atempo - biquads Matthieu Bouron: * Switch to AVFrame - alphamerge - decimate - volumedetect Stefano Sabatini: * Switch to AVFrame: - astreamsync - flite - framestep Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Carl Eugen Hoyos	3f78f0904b	Revert "build: disable iconv by default." This reverts commit `9ad3cd5b5f`. The misdetection on OS X should be fixed, we will only get problem reports if auto-detection is enabled.	12 years ago
Clément Bœsch	586ae70ba7	port FFmpeg lavc frame specificities to lavu functions.	12 years ago

1 2 3 4 5 ...

50664 Commits (b5e5ed8ea707fefcab15dbfa3fa0dc2f36e5275a) All Branches Search

50664 Commits (b5e5ed8ea707fefcab15dbfa3fa0dc2f36e5275a)

All Branches