summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * avconv: convert to new refcounted AVFrame APIAnton Khirnov2013-03-08
| |
* | Merge commit '37045e422903695e610cca6ecb753df643ab9380'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: drop vismv codeAnton Khirnov2013-03-08
| | | | | | | | | | It has been broken for over a year without anyone complaining or noticing, thus proving that nobody ever uses it.
* | utils: Dont sent fake channel layouts, 0 layout is better when its not knownMichael Niedermayer2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | * 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>
| * lavc: make up a fake frame channel layout when there is no real one.Anton Khirnov2013-03-08
| | | | | | | | | | This should ensure that a valid channel layout is always set on a frame, until a better solution is implemented.
* | Merge commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | * commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d': lavc: limit maximum number of channels to 63 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: limit maximum number of channels to 63Anton Khirnov2013-03-08
| | | | | | | | | | | | This is the most that can be represented with the current channel layout system. This limit should be raised/removed when a better system is implemented.
* | Merge commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | * commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca': lavc: allow decoders to override frame parameters. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: allow decoders to override frame parameters.Anton Khirnov2013-03-08
| |
* | mss1: set frame defaultsMichael Niedermayer2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | buffer: use the atomic get instead of the add and fetch variant.Clément Bœsch2013-03-12
| |
* | get_video_buffer: add vertical paddingMichael Niedermayer2013-03-12
| | | | | | | | | | | | Fix memory corruption Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: fix motion vector vissualizationMichael Niedermayer2013-03-12
| | | | | | | | | | | | was broken by the buffer ref stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264/mpegvideo: fix ff_print_debug_info2 argumentsMichael Niedermayer2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: move ff_print_debug_info2 to where ff_print_debug_info isMichael Niedermayer2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | atomic: prefer gcc builtins over win32 atomics, if available.Hendrik Leppkes2013-03-12
| | | | | | | | | | | | | | 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>
* | atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronizeMartin Storsjö2013-03-12
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | snow: set frame defaultsMichael Niedermayer2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3b199d29cd597a3518136d78860e172060b9e83d'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc decoders: properly initialize AVFrame.Anton Khirnov2013-03-08
| |
* | h264: disallow single unpaired fields as references of framesMichael Niedermayer2013-03-12
| | | | | | | | Fixes deadlock
* | lavfi/moviesrc: use refcounted framesHendrik Leppkes2013-03-12
| |
* | h264: fix null pointer dereference and assertion failureMichael Niedermayer2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_alloc_picture: free tables in case of dimension mismatchesMichael Niedermayer2013-03-12
| | | | | | | | | | | | 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
* | mpegvideo: dont allow last == currentMichael Niedermayer2013-03-12
| | | | | | | | | | | | this fixes deadlocks Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update_frame_pool: use channel fieldMichael Niedermayer2013-03-12
| | | | | | | | | | | | Fix memory corruption Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '759001c534287a96dc96d1e274665feb7059145d'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc decoders: work with refcounted frames.Anton Khirnov2013-03-08
| |
* | snowdec: fix off by 1 error in dimensions checkMichael Niedermayer2013-03-12
| | | | | | | | | | | | fixes infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/buffersink: move the filter structures at the end.Nicolas George2013-03-11
| | | | | | | | | | Also apply a few cosmetic fixes (spaces, trailing comma) to help match them with the fork's implementation.
* | cmdutils: remove conditionnal pp include.Clément Bœsch2013-03-11
| | | | | | | | | | The definition of the include are needed for builds even without pp. This should fix FATE with --disable-gpl after 63edd2f9.
* | lavfi/buffersink: implement av_buffersink_get_samples().Nicolas George2013-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | lavfi/buffersrc: do not dereference NULL frame.Nicolas George2013-03-10
| | | | | | | | frame = NULL is used to indicate EOF.
* | lavfi: rename sink_buffer.c into buffersink.c.Nicolas George2013-03-10
| |
* | lavfi: remove buffersink.c.Nicolas George2013-03-10
| | | | | | | | | | It only contains merge conflicts leftovers. The real code is in sink_buffer.c.
* | lavfi/sink_buffer: move stuff to reduce the diff.Nicolas George2013-03-10
| | | | | | | | | | | | Note: av_buffersink_get_samples() is not yet implemented, abuffersink is not yet a drop-in replacement of the fork's abuffersink.
* | lavfi/smartblur: add support to named optionsStefano Sabatini2013-03-10
| |
* | ffmpeg: re-enable use of buffersrc flags.Nicolas George2013-03-10
| | | | | | | | AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
* | lavfi/buffersrc: implement flags.Nicolas George2013-03-10
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | ffmpeg: add the -canvas_size option.Nicolas George2013-03-10
| | | | | | | | | | | | | | | | 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.
* | ffmpeg: port sub2video to AVFrame.Nicolas George2013-03-10
| | | | | | | | And re-enable the FATE test.
* | doc/ffplay,ffmpeg: mention the corresponding negated option for -statsStefano Sabatini2013-03-10
| | | | | | | | | | | | | | | | | | 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.
* | cmdutils: clarify log message, in case of option routed to both codec and ↵Stefano Sabatini2013-03-10
| | | | | | | | mux/demux layer
* | cmdutils: remove duplicated check on CONFIG_POSTPROCStefano Sabatini2013-03-10
| | | | | | | | The check is already performed by the PRINT_LIB_INFO macro.
* | cmdutils: make print_all_libs_info() show libavresample versionStefano Sabatini2013-03-10
| | | | | | | | | | Even if not directly supported by FFmpeg, it is still useful to see the linked version of libavresample.
* | cmdutils: fix stylenitsStefano Sabatini2013-03-10
| |
* | lavfi/unsharp: add missing option flagsStefano Sabatini2013-03-10
| |
* | lavc/utils: fix typo and reword message in case of too low bitrateStefano Sabatini2013-03-10
| |
* | avfilter: avoid direct access to "frame"->channelsMichael Niedermayer2013-03-10
| | | | | | | | | | | | This avoids ABI issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 21:29:51 +0000