summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-1829-199/+565
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) als: prevent infinite loop in zero_remaining(). cook: prevent div-by-zero if channels is zero. pamenc: switch to encode2(). svq1enc: switch to encode2(). dvenc: switch to encode2(). dpxenc: switch to encode2(). pngenc: switch to encode2(). v210enc: switch to encode2(). xwdenc: switch to encode2(). ttadec: use branchless unsigned-to-signed unfolding avcodec: add a Sun Rasterfile encoder sunrast: Move common defines to a new header file. cdxl: fix video decoding for some files cdxl: fix audio for some samples apetag: add proper support for binary tags ttadec: remove dead code swscale: make access to filter data conditional on filter type. swscale: update context offsets after removal of AlpMmxFilter. prores: initialise encoder and decoder parts only when needed swscale: make monowhite/black RGB-independent. ... Conflicts: Changelog libavcodec/alsdec.c libavcodec/dpxenc.c libavcodec/golomb.h libavcodec/pamenc.c libavcodec/pngenc.c libavformat/img2.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * als: prevent infinite loop in zero_remaining().Ronald S. Bultje2012-02-171-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * cook: prevent div-by-zero if channels is zero.Ronald S. Bultje2012-02-171-0/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * pamenc: switch to encode2().Anton Khirnov2012-02-171-10/+16
| |
| * svq1enc: switch to encode2().Anton Khirnov2012-02-171-7/+17
| |
| * dvenc: switch to encode2().Anton Khirnov2012-02-171-8/+17
| |
| * dpxenc: switch to encode2().Anton Khirnov2012-02-171-13/+23
| |
| * pngenc: switch to encode2().Anton Khirnov2012-02-171-8/+21
| |
| * v210enc: switch to encode2().Anton Khirnov2012-02-171-10/+12
| |
| * xwdenc: switch to encode2().Anton Khirnov2012-02-171-9/+12
| |
| * ttadec: use branchless unsigned-to-signed unfoldingJustin Ruggles2012-02-171-2/+1
| |
| * avcodec: add a Sun Rasterfile encoderAneesh Dogra2012-02-177-3/+236
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * sunrast: Move common defines to a new header file.Aneesh Dogra2012-02-172-26/+52
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * cdxl: fix video decoding for some filesPaul B Mahol2012-02-171-14/+13
| | | | | | | | | | | | | | Width is padded for ham encodings too. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * cdxl: fix audio for some samplesPaul B Mahol2012-02-171-7/+11
| | | | | | | | | | | | | | There may be extra padding at and of chunk. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * apetag: add proper support for binary tagsPaul B Mahol2012-02-171-8/+27
| | | | | | | | | | | | | | export as attachment streams Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * ttadec: remove dead codePaul B Mahol2012-02-171-28/+17
| | | | | | | | | | | | | | | | The unused code being removed is for encoding only and therefore is not needed by the decoder. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * swscale: make access to filter data conditional on filter type.Ronald S. Bultje2012-02-171-10/+20
| | | | | | | | | | Prevents crashes on 1-tap filter (unscaled). Also rename "bguf" argument to "vbuf", seems that was a typo.
| * swscale: update context offsets after removal of AlpMmxFilter.Ronald S. Bultje2012-02-172-7/+6
| |
| * prores: initialise encoder and decoder parts only when neededKostya Shishkov2012-02-171-2/+10
| |
| * swscale: make monowhite/black RGB-independent.Ronald S. Bultje2012-02-161-21/+36
| | | | | | | | | | | | Disadvantage is that it no longer allows modifying brightness through adjustment of the RGB lookup table. Advantage is that now monowhite/black no longer need to be identified as a RGB format.
| * flac: fix infinite loops on all-zero input or end-of-stream.Ronald S. Bultje2012-02-162-1/+10
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * wmapro: change max. block size to 13 bits.Ronald S. Bultje2012-02-164-7/+13
| | | | | | | | | | | | | | WMApro actually support 13-bits block sizes (potentially even up to 14), and thus we should support that also. If we get block sizes beyond what the decoder can handle (14 is possible depending on s->decode_flags), error out instead of crashing.
* | Fix ffmpeg -codecs output.Carl Eugen Hoyos2012-02-171-1/+1
| |
* | y41penc: switch to encode2()Paul B Mahol2012-02-171-9/+13
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | r210enc: switch to encode2()Paul B Mahol2012-02-171-12/+16
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: change deblock_h_chroma_8_mmxext() to prevent valgrind confusion.Michael Niedermayer2012-02-171-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Make CDXL palette opaque.Carl Eugen Hoyos2012-02-171-1/+1
| |
* | matroskadec: introduce resync function.Reimar Döffinger2012-02-171-6/+46
| | | | | | | | | | | | | | | | This allows handling matroska files with errors. Fixes test4.mkv and test7.mkv from the official Matroska test suite. These are also trac issues #544 and #545. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add ismv regression test.Reimar Döffinger2012-02-173-1/+14
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | movenc: fix crashes if a stream is empty.Reimar Döffinger2012-02-171-1/+4
| | | | | | | | | | | | | | For some reason this always happens with -f ismv. See trac issue #996. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | prores: initialise encoder and decoder parts only when neededKostya Shishkov2012-02-171-2/+10
| |
* | movenc: leave st->codec->frame_size as is instead of forcing it to 1.Andrew Wason2012-02-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Muxing pcm audio in MOV using avcodec_encode_audio() was failing because avcodec_encode_audio() returns an incorrect packet size of 4 bytes. This can be reproduced by modifying the sample ffmpeg/doc/examples/muxing.c to encode PCM, see ML patch muxing-test.diff I git bisected and commit 89ddff92a385 is the one that broke this. In mov_write_header() if st->codec->frame_size <= 1 it sets it to 1. Then avcodec_encode_audio() sets frame->nb_samples = avctx->frame_size, and frame->nb_samples of 1 is used to compute a packet size of 4 bytes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Makefile: fix proresdec dependanciesZongyao Qu2012-02-171-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: add count_frames and count_packets optionsMatthieu Bouron2012-02-174-11/+54
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-1717-140/+244
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: shorten: Use separate pointers for the allocated memory for decoded samples. atrac3: Fix crash in tonal component decoding. ws_snd1: Fix wrong samples counts. movenc: Don't set a default sample duration when creating ismv rtp: Factorize the check for distinguishing RTCP packets from RTP golomb: avoid infinite loop on all-zero input (or end of buffer). bethsoftvid: synchronize video timestamps with audio sample rate bethsoftvid: add audio stream only after getting the first audio packet bethsoftvid: Set video packet duration instead of accumulating pts. bethsoftvid: set packet key frame flag for audio and I-frame video packets. bethsoftvid: fix read_packet() return codes. bethsoftvid: pass palette in side data instead of in a separate packet. sdp: Ignore RTCP packets when autodetecting RTP streams proresenc: initialise 'sign' variable mpegaudio: replace memcpy by SIMD code vc1: prevent using last_frame as a reference for I/P first frame. Conflicts: libavcodec/atrac3.c libavcodec/golomb.h libavcodec/shorten.c libavcodec/ws-snd1.c tests/ref/fate/bethsoft-vid Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * shorten: Use separate pointers for the allocated memory for decoded samples.Michael Niedermayer2012-02-161-6/+8
| | | | | | | | | | | | | | | | | | | | | | Fixes invalid free() if any of the buffers are not allocated due to either not decoding a header or an error prior to allocating all buffers. Fixes CVE-2012-0858 CC: libav-stable@libav.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * atrac3: Fix crash in tonal component decoding.Michael Niedermayer2012-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add a check to avoid writing past the end of the channel_unit.components[] array. Bug Found by: cosminamironesei Fixes CVE-2012-0853 CC: libav-stable@libav.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * ws_snd1: Fix wrong samples counts.Michael Niedermayer2012-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | This makes the check that avoids overwrite of the samples array actually work properly. fixes CVE-2012-0848 CC: libav-stable@libav.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * movenc: Don't set a default sample duration when creating ismvMartin Storsjö2012-02-161-3/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtp: Factorize the check for distinguishing RTCP packets from RTPMartin Storsjö2012-02-166-5/+7
| | | | | | | | | | | | The binary doesn't change after this patch. Signed-off-by: Martin Storsjö <martin@martin.st>
| * golomb: avoid infinite loop on all-zero input (or end of buffer).Ronald S. Bultje2012-02-161-2/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * bethsoftvid: synchronize video timestamps with audio sample rateJustin Ruggles2012-02-162-88/+100
| | | | | | | | | | | | | | | | According to unofficial documentation, the video rate is locked to the audio sample rate. This results in proper synchronization of audio and video timestamps from the demuxer. This only works if the first audio packet occurs before the first video packet or the audio sample rate is the default rate of 11111 Hz, both of which are true for all samples in our archive.
| * bethsoftvid: add audio stream only after getting the first audio packetJustin Ruggles2012-02-161-15/+27
| | | | | | | | | | | | This avoids initializing a stream with dummy values or when the file does not contain audio. Also set duration for audio packets, using the sample rate as the time base.
| * bethsoftvid: Set video packet duration instead of accumulating pts.Justin Ruggles2012-02-162-28/+25
| |
| * bethsoftvid: set packet key frame flag for audio and I-frame video packets.Justin Ruggles2012-02-161-0/+3
| | | | | | | | | | Fixes avconv video stream copy of bethsoft video, which was skipping all video frames unless the copyinkf option was used.
| * bethsoftvid: fix read_packet() return codes.Justin Ruggles2012-02-161-9/+22
| | | | | | | | Use proper AVERROR codes, and return 0 for no error.
| * bethsoftvid: pass palette in side data instead of in a separate packet.Justin Ruggles2012-02-164-80/+112
| | | | | | | | | | | | Update FATE reference to account for now non-existent palette packet. This also fixes the FATE test if frame data is not initialized in get_buffer(), so update comment in avconv accordingly.
| * sdp: Ignore RTCP packets when autodetecting RTP streamsMartin Storsjö2012-02-161-0/+3
| | | | | | | | | | | | | | | | The rtp demuxer which listens for RTP packets and detects the RTP payload type will currently get confused if the first packet received is an RTCP packet. Thus ignore such packets. Signed-off-by: Martin Storsjö <martin@martin.st>
| * proresenc: initialise 'sign' variableKostya Shishkov2012-02-161-0/+2
| |
OpenPOWER on IntegriCloud