aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* af_pan: move query_format before config_props.Nicolas George2012-02-201-23/+23
| | | | | That is the logical order in which the functions are called, and there is no longer any need of forward declarations.
* af_pan: remove the indirect function call.Nicolas George2012-02-201-16/+1
| | | | libswresample is used in all cases.
* Add missing av_free_packet.Reimar Döffinger2012-02-201-0/+1
| | | | | | | Fixes memory leak when encoding at least with mpegvideo using the new encode2 function. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* af_pan: reindent after last commit.Nicolas George2012-02-201-23/+21
|
* af_pan: use libswr for rematrixing.Nicolas George2012-02-202-50/+24
|
* libswr: allow to set custom matrices.Nicolas George2012-02-205-11/+60
|
* matroskadec: remove H.264 special-case that disabled header parsing.Reimar Döffinger2012-02-201-1/+0
| | | | | | | | | The parser was fixed so this workaround should no longer be necessary. This allows using stream-copy to fix files with keyframes incorrectly marked. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* ffprobe: report bit rate in stream descriptionMatthieu Bouron2012-02-202-0/+3
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavc: set bit_rate in the decoder context, just after the init stageStefano Sabatini2012-02-202-24/+27
| | | | | Also move the get_bit_rate() function, in order to avoid an undefined symbol reference in avcodec_open2().
* doc: fix channel layout value in abuffer example.Clément Bœsch2012-02-201-2/+2
| | | | | The channel layout must start with 0x, otherwise it is parsed as a number of channels.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-2016-46/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxy: remove reference to removed api examples: unbreak compilation ttadec: cosmetics: reindent sunrast: use RLE trigger macro inplace of the hard coded value. sunrastenc: set keyframe flag for the output packet. mpegvideo_enc: switch to encode2(). mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0 Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxy: remove reference to removed apiLuca Barbato2012-02-191-4/+3
| |
| * examples: unbreak compilationLuca Barbato2012-02-192-19/+9
| | | | | | | | Update api so it will compile again.
| * ttadec: cosmetics: reindentPaul B Mahol2012-02-191-4/+4
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * sunrast: use RLE trigger macro inplace of the hard coded value.Aneesh Dogra2012-02-191-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * sunrastenc: set keyframe flag for the output packet.Aneesh Dogra2012-02-191-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mpegvideo_enc: switch to encode2().Anton Khirnov2012-02-1910-22/+51
| |
| * mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0Anton Khirnov2012-02-191-1/+2
| | | | | | | | | | | | This allows the following commit to extrapolate better dts for the first frame. Pts difference between the first two frames is reused as the difference between pts and dts of the first frame.
* | wmalossless: Fix infinite loop.Michael Niedermayer2012-02-191-1/+4
| | | | | | | | | | | | Fixes more of Ticket1000 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalossless: Switch to new audio APIMichael Niedermayer2012-02-191-23/+13
| | | | | | | | | | | | Partially fixes Ticket1000 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalossless: remove tabMichael Niedermayer2012-02-191-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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
| | |