summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavc/utils: propagate or return meaningful error codes in avcodec_open2()Stefano Sabatini2012-10-241-3/+3
|
* Do not detect mov with maximum score if the atom size is too small.Carl Eugen Hoyos2012-10-231-1/+8
| | | | Fixes mpegts-in-mov, ticket #987 / issue 2223.
* lavd/lavfi: add graph_file optionStefano Sabatini2012-10-233-1/+36
| | | | | | | | Allow to specify a filename where to put the filtergraph description. This is useful to override limitations or glitches of particular shell environments, and allows a level of indirection for specifying filtergraphs.
* lavfi/sendcmd: move buf init() variable to internal scope where it is usedStefano Sabatini2012-10-231-2/+1
|
* lavfi/sendcmd: release file in case of failed allocationStefano Sabatini2012-10-231-1/+3
| | | | Avoid hanging file.
* x11: Fix x11grab BadCursorIsaac Dooley2012-10-231-0/+7
| | | | | | | | Fixes Ticket1738 Based-on: A fix found in a perl module (http://ffmpeg.org/pipermail/ffmpeg-user/2012-August/008804.html) Reviewed-by: Clemens Fruhwirth <clemens@endorphin.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* pnmdec: use more meaningful error codesPaul B Mahol2012-10-231-8/+8
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavf: fix duration estimation for multi program TSMichael Niedermayer2012-10-232-2/+31
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: increase retries to guess duration from pts by 1Michael Niedermayer2012-10-231-1/+1
| | | | | | This fixes finding the duration for one TS file Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* asfdec: ignore stored duration for truncated filesMichael Niedermayer2012-10-231-2/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wtvdec: display warning for encrypted wtv files (instead of 'unsupported ↵Peter Ross2012-10-231-0/+5
| | | | | | chunk' messages) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-231-2/+4
|\ | | | | | | | | | | | | | | * qatar/master: fate: check that dependencies actually exist fate: fix ENCMUX macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: check that dependencies actually existMans Rullgard2012-10-231-1/+3
| | | | | | | | | | | | | | This causes make to exit with an error message if a nonexistent dependency is specified rather than silently dropping the test. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fate: fix ENCMUX macroMans Rullgard2012-10-231-1/+1
| | | | | | | | | | | | This matches how it is actually being called. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25'Michael Niedermayer2012-10-235-32/+33
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec444c84cfd30ef34a4e7b4ec7ee77d7e5250d25': mpegaudiodec: Fix buffer handling on random access mpegaudio: Refactor mp3on4 flush function fate: Add dependencies for audio tests fate: cosmetics: Group idct8x8 test together with all other libavcodec tests fate: More fine-grained dependencies for libavcodec test programs Conflicts: tests/fate/audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudiodec: Fix buffer handling on random accessMichael Niedermayer2012-10-231-0/+1
| |
| * mpegaudio: Refactor mp3on4 flush functionDiego Biurrun2012-10-231-8/+9
| |
| * fate: Add dependencies for audio testsDiego Biurrun2012-10-231-13/+13
| |
| * fate: cosmetics: Group idct8x8 test together with all other libavcodec testsDiego Biurrun2012-10-233-6/+6
| |
| * fate: More fine-grained dependencies for libavcodec test programsDiego Biurrun2012-10-231-5/+5
| |
* | Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'Michael Niedermayer2012-10-2316-47/+32
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b8899ac3233b4f7af83ded0dc032fad8902d714': fate: Declare avcodec/avformat deps in the respective Makefile snippets fate: Add dependencies for WMA and WavPack tests Improve wording and spelling of av_log_missing_feature messages. lavu: remove disabled FF_API_AV_FIFO_PEEK cruft Conflicts: libavcodec/aacsbr.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Declare avcodec/avformat deps in the respective Makefile snippetsDiego Biurrun2012-10-233-3/+2
| |
| * fate: Add dependencies for WMA and WavPack testsDiego Biurrun2012-10-232-19/+19
| |
| * Improve wording and spelling of av_log_missing_feature messages.Diego Biurrun2012-10-2310-14/+14
| |
| * lavu: remove disabled FF_API_AV_FIFO_PEEK cruftAnton Khirnov2012-10-232-14/+0
| |
* | Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'Michael Niedermayer2012-10-231-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'c692957c4edd119920cd7f2121628dd183589e6a': lavu: remove disabled avoptions cruft lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: remove disabled avoptions cruftAnton Khirnov2012-10-233-229/+0
| |
| * lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruftAnton Khirnov2012-10-233-19/+0
| |
* | Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'Michael Niedermayer2012-10-236-34/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '468ea9d5b14f92fe61f47f034e67066f65163f5f': Revert "avutil: make some tables visible again" Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility" Conflicts: libavcodec/sqrt_tab.c libavutil/libavutil.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "avutil: make some tables visible again"Anton Khirnov2012-10-231-1/+1
| | | | | | | | | | | | This reverts commit def8c94699877d015154a03d43e2b8f479cd89a0. After the major bump this is no longer necessary.
| * Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI ↵Anton Khirnov2012-10-235-33/+11
| | | | | | | | | | | | | | | | compatibility" This reverts commit d15c21e5fa3961f10026da1a3080a3aa3cf4cec9. After the major bump this is no longer necessary.
* | Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'Michael Niedermayer2012-10-232-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'add3a6902ea4d459f36655656a1f8daa409118a7': lavu: bump major to 52 Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: bump major to 52Anton Khirnov2012-10-232-3/+3
| | | | | | | | | | | | In addition to the recent tables mess, the AVOption defaults behavior changed, so an old lavc used with a new lavu will get completely messed up defaults.
* | Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'Michael Niedermayer2012-10-234-54/+48
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a': lavu: postpone recent deprecations until the next major bump APIchanges: update lavr bump date avconv: only apply presets when we have an encoder. atrac3: replace a calculation with FFALIGN() atrac3: remove unused ATRAC3Context field, sample_rate atrac3: use sizeof(variable) instead of sizeof(type) atrac3: simplify MDCT window calculation Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: postpone recent deprecations until the next major bumpAnton Khirnov2012-10-231-4/+4
| |
| * APIchanges: update lavr bump dateAnton Khirnov2012-10-231-1/+1
| |
| * avconv: only apply presets when we have an encoder.Anton Khirnov2012-10-231-27/+28
| | | | | | | | | | | | Fixes a crash when using a preset with stream copy. CC: libav-stable@libav.org
| * atrac3: replace a calculation with FFALIGN()Justin Ruggles2012-10-221-2/+1
| | | | | | | | | | This allocates 4 bytes less than the previous code if avctx->block_align is a multiple of 4, but the extra 4 bytes is not really needed.
| * atrac3: remove unused ATRAC3Context field, sample_rateJustin Ruggles2012-10-221-4/+0
| |
| * atrac3: use sizeof(variable) instead of sizeof(type)Justin Ruggles2012-10-221-6/+7
| |
| * atrac3: simplify MDCT window calculationJustin Ruggles2012-10-221-10/+7
| |
* | Merge commit '5d1007f74dd496d54b932242004382f44e3b22b4'Michael Niedermayer2012-10-231-46/+41
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '5d1007f74dd496d54b932242004382f44e3b22b4': atrac3: initialize static tables in AVCodec.init_static_data() atrac3: separate window initialization from IMDCT initialization atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used atrac3: remove unused ATRAC3Context field, bit_rate Conflicts: libavcodec/atrac3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac3: initialize static tables in AVCodec.init_static_data()Justin Ruggles2012-10-221-26/+27
| |
| * atrac3: separate window initialization from IMDCT initializationJustin Ruggles2012-10-221-12/+9
| |
| * atrac3: move the 'frame_factor' field from ATRAC3Context to where it is usedJustin Ruggles2012-10-221-7/+6
| |
| * atrac3: remove unused ATRAC3Context field, bit_rateJustin Ruggles2012-10-221-2/+0
| |
* | Merge commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27'Michael Niedermayer2012-10-231-36/+28
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'a2664c91fba15a1307f676ffad511f8f86fb3a27': atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used atrac3: remove unused ATRAC3Context field, samples_per_channel atrac3: use AVCodecContext.block_align instead of keeping a private copy atrac3: move the 'delay' field from ATRAC3Context to where it is used atrac3: move the 'version' field from ATRAC3Context to where it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is ↵Justin Ruggles2012-10-221-7/+6
| | | | | | | | used
| * atrac3: remove unused ATRAC3Context field, samples_per_channelJustin Ruggles2012-10-221-3/+1
| |
| * atrac3: use AVCodecContext.block_align instead of keeping a private copyJustin Ruggles2012-10-221-17/+13
| |
OpenPOWER on IntegriCloud