aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmdutils: remove unneeded null checkMichael Niedermayer2012-10-171-1/+1
| | | | | Fixes CID703769 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* examples/muxing: merge add_audio_stream() and add_video_stream()Stefano Sabatini2012-10-171-70/+55
| | | | Factorize.
* examples/muxing: check on frameStefano Sabatini2012-10-171-1/+2
| | | | Fix crash in case frame is not defined (e.g. with muxing out.wav).
* examples/muxing: fix bogus setting of st->idStefano Sabatini2012-10-171-3/+2
|
* examples/muxing: remove misleading comment about pending API changeStefano Sabatini2012-10-171-2/+1
| | | | | The API was never changed since 2003. Replace with a comment about the performed operation.
* examples/muxing: remove video_outbuf unused and useless codeStefano Sabatini2012-10-171-15/+1
|
* lavfi/avf_concat: fix invalid exclusive test.Nicolas George2012-10-171-1/+1
| | | | | | | The invalid test did not cause any actual problem since the first branch is only possible with bogus filters. Fix coverity issue CID 733850.
* tiff: run strlen() after setting the pointerMichael Niedermayer2012-10-171-1/+2
| | | | | Fixes CID733803 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmdec: check av_new_packet() return valueMichael Niedermayer2012-10-171-1/+3
| | | | | Fixes CID733711 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmdec: fix hypothetical overflowsMichael Niedermayer2012-10-171-2/+2
| | | | | Fixes CID703739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffm_read_write_index: check lseek return codeMichael Niedermayer2012-10-171-1/+2
| | | | | Fixes CID732184 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffm_write_write_index: check lseek() return codeMichael Niedermayer2012-10-171-1/+2
| | | | | Fixes CID732185 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffm_seek: fix division by zeroMichael Niedermayer2012-10-171-1/+1
| | | | | Fixes CID732202 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavfilter/lavfutils: remove useless NULL check on format contextMichael Niedermayer2012-10-171-2/+1
| | | | | Fixes: CID733804 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavfilter/lavfutils: remove useless NULL check on codec contextMichael Niedermayer2012-10-171-2/+1
| | | | | | | The code would crash before if it was NULL Fixes CID733804 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov_probe: fix integer overflowsMichael Niedermayer2012-10-171-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* idcinvideo: remove redundant " id CIN Video: " from av_log()Paul B Mahol2012-10-171-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-172-3/+7
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Add support for Tilera processors wavdec: check size before reading the data, not after. Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Add support for Tilera processorsDerek Buitenhuis2012-10-161-0/+5
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * wavdec: check size before reading the data, not after.Anton Khirnov2012-10-161-3/+2
| |
* | Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'Michael Niedermayer2012-10-170-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4': wav: do not fail on empty INFO tags Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wav: do not fail on empty INFO tagsAnton Khirnov2012-10-161-1/+1
| | | | | | | | | | | | Fixes Bug 379 CC: libav-stable@libav.org
* | Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'Michael Niedermayer2012-10-173-196/+232
|\| | | | | | | | | | | | | | | | | | | * commit '31c54711cc3f1484af101d629bbb805820d37ad1': lavf: split wav muxer and demuxer into separate files. Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: split wav muxer and demuxer into separate files.Anton Khirnov2012-10-163-195/+230
| |
* | Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'Michael Niedermayer2012-10-178-24/+28
|\| | | | | | | | | | | | | | | | | | | | | * commit '58b619c8a226cc4564ad5af291bc99a04f89ee56': wav muxer: write metadata Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wav muxer: write metadataVictor Vasiliev2012-10-163-1/+5
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'Michael Niedermayer2012-10-17111-688/+706
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0bca0283ccded5e32da143a462168ad1988a58fd': riff: do not write empty INFO tags Conflicts: tests/ref/fate/vsynth1-cljr tests/ref/fate/vsynth1-ffvhuff tests/ref/fate/vsynth1-h261 tests/ref/fate/vsynth1-h263 tests/ref/fate/vsynth1-h263-obmc tests/ref/fate/vsynth1-h263p tests/ref/fate/vsynth1-huffyuv tests/ref/fate/vsynth1-jpegls tests/ref/fate/vsynth1-mjpeg tests/ref/fate/vsynth1-mpeg4-adap tests/ref/fate/vsynth1-mpeg4-adv tests/ref/fate/vsynth1-mpeg4-error tests/ref/fate/vsynth1-mpeg4-nr tests/ref/fate/vsynth1-mpeg4-qpel tests/ref/fate/vsynth1-mpeg4-qprd tests/ref/fate/vsynth1-mpeg4-rc tests/ref/fate/vsynth1-mpeg4-thread tests/ref/fate/vsynth1-msmpeg4 tests/ref/fate/vsynth1-msmpeg4v2 tests/ref/fate/vsynth1-rgb tests/ref/fate/vsynth1-wmv1 tests/ref/fate/vsynth1-wmv2 tests/ref/fate/vsynth1-yuv tests/ref/fate/vsynth2-cljr tests/ref/fate/vsynth2-ffvhuff tests/ref/fate/vsynth2-h261 tests/ref/fate/vsynth2-h263 tests/ref/fate/vsynth2-h263-obmc tests/ref/fate/vsynth2-h263p tests/ref/fate/vsynth2-huffyuv tests/ref/fate/vsynth2-jpegls tests/ref/fate/vsynth2-mjpeg tests/ref/fate/vsynth2-mpeg4-adap tests/ref/fate/vsynth2-mpeg4-error tests/ref/fate/vsynth2-mpeg4-nr tests/ref/fate/vsynth2-mpeg4-qpel tests/ref/fate/vsynth2-mpeg4-qprd tests/ref/fate/vsynth2-mpeg4-rc tests/ref/fate/vsynth2-mpeg4-thread tests/ref/fate/vsynth2-msmpeg4 tests/ref/fate/vsynth2-msmpeg4v2 tests/ref/fate/vsynth2-rgb tests/ref/fate/vsynth2-wmv1 tests/ref/fate/vsynth2-wmv2 tests/ref/fate/vsynth2-yuv tests/ref/lavf/avi tests/ref/seek/h261_avi tests/ref/seek/h263_avi tests/ref/seek/h263p_avi tests/ref/seek/lavf_avi tests/ref/seek/mjpeg_avi tests/ref/seek/mpeg4_adap_avi tests/ref/seek/mpeg4_error_avi tests/ref/seek/mpeg4_nr_avi tests/ref/seek/mpeg4_qpel_avi tests/ref/seek/mpeg4_qprd_avi tests/ref/seek/mpeg4_rc_avi tests/ref/seek/mpeg4_thread_avi tests/ref/seek/msmpeg4_avi tests/ref/seek/msmpeg4v2_avi tests/ref/seek/wmv1_avi tests/ref/seek/wmv2_avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: do not write empty INFO tagsVictor Vasiliev2012-10-1692-666/+684
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'Michael Niedermayer2012-10-174-25/+51
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68': lavf: move RIFF INFO tag writing from avienc to riff avconv: fix disabling auto mappings with -map_metadata Conflicts: ffmpeg_opt.c libavformat/riff.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move RIFF INFO tag writing from avienc to riffVictor Vasiliev2012-10-163-24/+44
| | | | | | | | | | | | It will be useful in the wav muxer. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avconv: fix disabling auto mappings with -map_metadataAnton Khirnov2012-10-161-3/+7
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'Michael Niedermayer2012-10-178-1045/+1131
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a25d912dca9cd553440167e0476c47581359c0fc': avcodec_encode_audio(): fix invalid free pcm-mpeg: correct bitrate calculation ffv1: K&R formatting cosmetics fate: Add rangecoder test network: #include stdint.h in network.h nut: export codec_tag provided by rawvideo avserver: move avserver-specific code from ffmdec.c to avserver.c Conflicts: ffserver.c libavcodec/ffv1.c libavformat/ffmdec.c libavformat/nutenc.c tests/ref/lavfi/crop tests/ref/lavfi/crop_scale tests/ref/lavfi/crop_scale_vflip tests/ref/lavfi/crop_vflip tests/ref/lavfi/null tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_pad tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip tests/ref/lavfi/scale200 tests/ref/lavfi/scale500 tests/ref/lavfi/vflip tests/ref/lavfi/vflip_crop tests/ref/lavfi/vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec_encode_audio(): fix invalid freeRafaël Carré2012-10-161-1/+1
| | | | | | | | | | | | | | Since 2bc0de385, AVFrame needs to be initialized before calling avcodec_get_frame_defaults(). Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * pcm-mpeg: correct bitrate calculationChristian Schmidt2012-10-161-2/+2
| | | | | | | | | | | | | | | | Bitrate calculation is off since the bluray spec always specifies an even number of coded channels. This was honored in the decoder, but not for bitrate calculation. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * ffv1: K&R formatting cosmeticsLuca Barbato2012-10-161-938/+1055
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * fate: Add rangecoder testDiego Biurrun2012-10-161-0/+6
| |
| * network: #include stdint.h in network.hMans Rullgard2012-10-161-0/+1
| | | | | | | | | | | | | | This header uses various types provided by stdint.h without explicitly including it. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * nut: export codec_tag provided by rawvideoLuca Barbato2012-10-1619-395/+395
| | | | | | | | | | | | Raw audio does not provide valid audio tags while rawvideo does. The fate refs have to be updated because it undoes the previous tag change.
| * avserver: move avserver-specific code from ffmdec.c to avserver.cMans Rullgard2012-10-163-37/+32
| | | | | | | | | | | | | | | | This way avserver only depends on the data structures of the ffm demuxer, which it already does, and not also on private functions being exported by the library. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavc/tta: use meaningful error codesPaul B Mahol2012-10-171-4/+4
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tta: datalen is unsigned integer per reference libraryPaul B Mahol2012-10-171-4/+5
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | sws-test: parse command line args before initing contextsMichael Niedermayer2012-10-171-19/+21
| | | | | | | | | | | | This fixes parsing comand line args after ref Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/swfdec: support DefineBitsLossless{,2} tag.Clément Bœsch2012-10-171-0/+123
| |
* | ffv1: fix packed rgb with 1.3Michael Niedermayer2012-10-171-2/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix time types related to mov_metadata_creation_timeMichael Niedermayer2012-10-171-4/+6
| | | | | | | | | | | | Fixes Ticket1817 Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | examples/muxing: fix video ptsMichael Niedermayer2012-10-171-4/+1
| | | | | | | | | | | | Fixes Ticket1801 Based on suggestion from AztecC Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: limit matching w/h/fmt asserts to non scale filtersMichael Niedermayer2012-10-171-3/+5
| | | | | | | | | | | | | | | | | | This fixes a regression with the scale filters input changing. In the long run filters should get a flag to indicate support of this and then this flag be used here. But the regression should not be left standing until thats done. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavfilter/buffersrc: Do not fail hard on changes of input parameters.Michael Niedermayer2012-10-171-2/+1
| | | | | | | | | | | | Several filters support this already. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Make video filter graph reinit user selectableMichael Niedermayer2012-10-173-2/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | yuvPlanartouyvy_c: fix sign extensionMichael Niedermayer2012-10-161-2/+2
| | | | | | | | | | Fixes CID732281 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>