aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmdutils: add -cpuflags.Michael Niedermayer2012-02-193-0/+16
| | | | | | | This allows globally forcing specific cpuflags (or lack thereof) Useful for debugging and benchmarking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2012-02-191-2/+2
|\ | | | | | | | | | | | | | | * shariman/wmall: Perform inter-channel decorr. only if both channels are coded Use fixed-length array in revert_mclms() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Perform inter-channel decorr. only if both channels are codedMashiat Sarker Shakkhar2012-02-181-1/+1
| |
| * Use fixed-length array in revert_mclms()Benjamin Larsson2012-02-161-1/+1
| |
* | pamdec: fix mono support.Michael Niedermayer2012-02-192-5/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | H264 parser: enable header parsing/frame type detection for is_avc.Reimar Döffinger2012-02-191-4/+15
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | pamenc: allocate the correct packetsize for mono.Michael Niedermayer2012-02-191-4/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pamenc: move allocation down.Michael Niedermayer2012-02-191-15/+16
| | | | | | | | | | | | | | This way the size that is calculated is known and can be used in a following commit. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: use av_fast_padded_malloc()Michael Niedermayer2012-02-191-3/+1
| | | | | | | | | | | | | | This zeros all the memory once and avoids valgrind warnings. alternatively the warnings could be suppressed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2dec: add im32 extension, sunrast with 32bit depthPaul B Mahol2012-02-191-0/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | examples: add -Wall to CFLAGS.Clément Bœsch2012-02-191-1/+1
| |
* | examples/filtering: fix unused variable and return value in open_input_file().Clément Bœsch2012-02-191-1/+2
| |
* | examples/filtering: fix deprecated function calls warnings.Clément Bœsch2012-02-191-4/+4
| |
* | examples/filtering: fix implicit declarations and function mis-usage.Clément Bœsch2012-02-191-2/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-1921-80/+218
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mov: Use defines for sample flags in fragments mov: Use defines for trun flags mov: Use defines for tfhd flags proresenc: force bitrate not to exceed given limit vc1parse: call vc1_init_common(). wma: don't return 0 on invalid packets. asf: prevent packet_size_left from going negative if hdrlen > pktlen. mjpegb: don't return 0 at the end of frame decoding. rtpdec: Identify incorrectly signalled H263 vp8dsp: split long line. aiff: don't skip block_align==0 check on COMM-after-SSND files. dpcm: ignore extra unpaired bytes in stereo streams. mp3on4: require a minimum framesize. mpc7: assign an error level + context to av_log() msg. huffyuv: error out on bit overrun. dct-test: Add the missing ff_ prefix to the altivec functions dct-test: Remove a stray declaration of a nonexistent function movenc: Write the unknown duration as 64 bit fields in ismv movenc: Write track durations with all bits set if duration is unknown Conflicts: libavcodec/dct-test.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mov: Use defines for sample flags in fragmentsMartin Storsjö2012-02-183-3/+15
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | mov: Use defines for trun flagsMartin Storsjö2012-02-183-19/+27
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | mov: Use defines for tfhd flagsMartin Storsjö2012-02-183-17/+26
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | proresenc: force bitrate not to exceed given limitKostya Shishkov2012-02-181-10/+62
| | | | | | | | | | | | | | | | | | Apple ProRes Format Specifications mentions target data size for every frame, so make sure frame meets it. This also allows encoder to demand much smaller packet sizes for output.
| * | vc1parse: call vc1_init_common().Ronald S. Bultje2012-02-183-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | The parser uses VLC tables initialized in vc1_common_init(), therefore we should call this function on parser init also. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | wma: don't return 0 on invalid packets.Ronald S. Bultje2012-02-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Return 0 means "please return the same data again", i.e. it causes an infinite loop. Instead, return an error. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | asf: prevent packet_size_left from going negative if hdrlen > pktlen.Ronald S. Bultje2012-02-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This prevents failed assertions further down in the packet processing where we require non-negative values for packet_size_left. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | mjpegb: don't return 0 at the end of frame decoding.Ronald S. Bultje2012-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Return 0 indicates "please return the same data again", i.e. it causes an infinite loop. Instead, return that we consumed the buffer if we finished decoding succesfully, or return an error if an error occurred. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | rtpdec: Identify incorrectly signalled H263Martin Storsjö2012-02-183-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | H263 in RTP can be packetized in two formats (RFC 2190, RFC 2429/4629). The former normally uses the static payload type 34, while the latter normally uses dynamic payload types with the SDP format names H263-1998 or H263-2000. Look for packets that don't look like proper RFC 2190 packets and switch to depacketizing them according to the new format if they match some heuristic criteria. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | vp8dsp: split long line.Ronald S. Bultje2012-02-181-1/+3
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | aiff: don't skip block_align==0 check on COMM-after-SSND files.Ronald S. Bultje2012-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | This prevents SIGFPEs when using block_align for divisions. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | dpcm: ignore extra unpaired bytes in stereo streams.Alex Converse2012-02-171-1/+6
| | | | | | | | | | | | | | | | | | Fixes: CVE-2011-3951 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * | mp3on4: require a minimum framesize.Ronald S. Bultje2012-02-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | If bufsize < headersize, init_get_bits() will be called with a negative number, causing it to fail and any subsequent call to get_bits() will crash because it reads from a NULL pointer. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | mpc7: assign an error level + context to av_log() msg.Ronald S. Bultje2012-02-171-1/+1
| | |
| * | huffyuv: error out on bit overrun.Ronald S. Bultje2012-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On EOF, get_bits() will continuously return 0, causing an infinite loop. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * | dct-test: Add the missing ff_ prefix to the altivec functionsMartin Storsjö2012-02-181-3/+3
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | dct-test: Remove a stray declaration of a nonexistent functionMartin Storsjö2012-02-181-2/+0
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | movenc: Write the unknown duration as 64 bit fields in ismvMartin Storsjö2012-02-181-0/+6
| | | | | | | | | | | | | | | | | | | | | This is required for the files to play back properly in windows media player. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | movenc: Write track durations with all bits set if duration is unknownMartin Storsjö2012-02-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | According to 14496-12, the duration should be all 1s if the duration is unknown. This is the case if writing a moov atom without any samples described in it (e.g. as in ismv files). Signed-off-by: Martin Storsjö <martin@martin.st>
* | | lavf-fate-ogg_vp3: Try -idct auto instead of -idct simple.Reimar Döffinger2012-02-182-1/+3
| | | | | | | | | | | | | | | | | | | | | -idct simple for some reason results in different results on different systems. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | oggenc: fix condition when not to flush due to keyframe granule.Reimar Döffinger2012-02-182-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous condition of 0 page size was wrong, that would disable the mechanism for all frames at a start of a page, thus some keyframes still would not get their own granule. The real problem is that header packets must not be flushed, but they have (and must have) 0 granule and thus would be detected as keyframes. Add a separate parameter to mark header packets. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | oggdec: improve warning message.Reimar Döffinger2012-02-181-1/+2
| | | | | | | | | | | | | | | | | | | | | Print whether it was a keyframe or a non-keyframe that was incorrectly marked as the other. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | ffprobe: fix crash if the file can't be opened.Clément Bœsch2012-02-181-6/+4
| | |
* | | Add muxer test based on stream-copy from FATE sample.Reimar Döffinger2012-02-186-3/+29
| | | | | | | | | | | | | | | | | | This should test muxing Theora into Ogg. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | ffmpeg: Fix setting flags for codec copy.Michael Niedermayer2012-02-181-0/+12
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Allow other programs to open the same files on Windows.Reimar Döffinger2012-02-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | In order to match Linux behaviour better our Windows-specific open() replacement should disable Windows default file locking. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Make AAC in Ogg (ogm) work.Reimar Döffinger2012-02-181-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs the extradata to be extracted. The approach used is the one MPlayer uses, though it is unclear whether the 4 bytes extradata that are skipped should be skipped always or only for AAC. The AAC parser must be disabled, too, otherwise playback still does not work. Fixes trac issue #547. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | lavfi/aspect: set default value to 0:1, as stated in the docsStefano Sabatini2012-02-181-0/+1
| | | | | | | | | | | | Fix regression introduced in commit 70ffda3217c58bbbfb8a7e7c58824b8ca6c56128.
* | | lavfi/aspect: remove confusing commentsStefano Sabatini2012-02-181-2/+0
| | |
* | | lavfi/aspect: show log info even in case no argument is provided to ↵Stefano Sabatini2012-02-181-2/+2
| | | | | | | | | | | | setdar/setsar
* | | movenc: Dont crash on aspect=0/0.Michael Niedermayer2012-02-181-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avidec: remove harmless duplicate code.Michael Niedermayer2012-02-181-1/+0
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | libx264: unbreak libx264rgbPaul B Mahol2012-02-181-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | 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