summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* nut: store and read the r_frame_rateMichael Niedermayer2012-10-0258-846/+857
| | | | | | | With this, when we use a finer timebase than neccessary to store durations the demuxer still knows what the original timebase was. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nutenc: use 1/sample rate as timebase for audio instead of framesize/sample rateMichael Niedermayer2012-10-023-40/+53
| | | | | | | This way audio frames can be exactly stored even when they are not aligned with timestamp 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* isom: fix redundant redeclaration of ff_mov_read_chan().Clément Bœsch2012-10-022-1/+1
| | | | | Silence a GCC warning. A leftover of the disabled version is still available in lavf/isom.c.
* lavfi/edgedetect: add missing minus in a comment.Clément Bœsch2012-10-011-1/+1
|
* lavfi: EBU R.128 scanner.Clément Bœsch2012-10-017-1/+799
|
* Move xGA font data from lavc to lavu.Clément Bœsch2012-10-019-402/+467
| | | | This needs to be accessible for libavfilter in the next commit.
* jpeglsdec: move pict debug log under correct if()Michael Niedermayer2012-10-011-6/+8
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cpu: improve av_get_cpu_flags() doxyMichael Niedermayer2012-10-011-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-0162-297/+176
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Convert some commented-out printf/av_log instances to av_dlogDiego Biurrun2012-10-0123-69/+105
| |
| * avcodec: Drop silly and/or broken printf debug outputDiego Biurrun2012-10-0121-94/+6
| |
| * avcodec: Drop some silly commented-out av_log() invocationsDiego Biurrun2012-10-0116-64/+7
| |
| * avformat: Convert some commented-out printf/av_log instances to av_dlogDiego Biurrun2012-10-019-29/+61
| |
| * avformat: Remove non-compiling and/or silly commented-out printf/av_log ↵Diego Biurrun2012-10-0113-48/+1
| | | | | | | | statements
| * Remove some silly disabled code.Diego Biurrun2012-10-012-12/+0
| |
| * ac3dec: ensure get_buffer() gets a buffer for the correct number of channelsJustin Ruggles2012-10-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | If there is an error during frame parsing, but AVCodecContext.channels was changed and AC3DecodeContext.out_channels was set previously, the two may not match. Fixes CVE-2012-2802 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | smacker: read escape codes in single get_bits() callPaul B Mahol2012-10-011-6/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | movenc: fix edit list for the case of negative pts.Michael Niedermayer2012-10-011-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: drop unused variableMichael Niedermayer2012-09-301-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: move main swscale wraper to swscale.cMichael Niedermayer2012-09-302-200/+201
| | | | | | | | | | | | It never belonged to swscale_unscaled.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | qt-faststart: simplify code by using FFMINMichael Niedermayer2012-09-301-4/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | qt-faststart: dont allocate a bigger buffer than neededMichael Niedermayer2012-09-301-2/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | qt-faststart: speedupJan Ehrhardt2012-09-301-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-faststart is terribly slow when the input file and the output file are on a slow disk like a SD card. By increasing the copy_buffer from 1K to 32M I decreased the processing time on a sample file from 1600 seconds to 4 seconds. The timing difference is during 'copying rest of file'. S:\SD_VIDEO\PRG001>e:\utils\qt-faststart 00005.mp4 5.mp4 ftyp 0 32 free 32 8 mdat 40 13744391 moov 13744431 141848 patching stco atom... patching stco atom... writing ftyp atom... writing moov atom... copying rest of file... Execution time: 1576.259 s S:\SD_VIDEO\PRG001>s:\utils\qt-faststart 00005.mp4 5.mp4 ftyp 0 32 free 32 8 mdat 40 13744391 moov 13744431 141848 patching stco atom... patching stco atom... writing ftyp atom... writing moov atom... copying rest of file... Execution time: 3.846 s Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/ashowinfo: check plane value before deferencing.Clément Bœsch2012-09-301-2/+2
| |
* | xtea: fix decryption with --enable-smallGiorgio Vazzana2012-09-301-2/+2
| | | | | | | | | | | | iv decrypt handling code needs to be executed regardless of CONFIG_SMALL Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: fix To{Y,UV} extern prototypes.Clément Bœsch2012-09-301-2/+5
| | | | | | | | | | This fix a bunch of "assignment from incompatible pointer type" warnings with GCC.
* | APIchanges: fill hashes.Clément Bœsch2012-09-301-25/+25
| | | | | | | | Also fix some dates (use the commit date instead of the author date).
* | Move subrip/text API change info from Changelog to doc/APIchanges.Clément Bœsch2012-09-302-2/+4
| | | | | | | | Note that a lavf bump was missing so I'm using 54.28.100 as a reference.
* | fft-test: fix order of operations for calculating the average errorMichael Niedermayer2012-09-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vima: check packet size before initializing bitstream readerPaul B Mahol2012-09-301-2/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | vima: fix typo in license headerPaul B Mahol2012-09-301-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | xtea: move iv decrypt handling code into xtea_crypt_ecb()Michael Niedermayer2012-09-301-17/+9
| | | | | | | | | | | | this simplifies things are avoids a temporary Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xtea-test: test inplace decryptionMichael Niedermayer2012-09-301-1/+15
| | | | | | | | | | Based on test code by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xtea: fix CBC mode when src=dstGiorgio Vazzana2012-09-301-1/+8
| | | | | | | | | | | | | | | | | | In CBC mode, when src=dst and we are decrypting a block different from the first one, we need to save the current block of ciphertext (which will constitute the initialization vector for the next block) before we overwrite it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xtea-test: factorize test codeMichael Niedermayer2012-09-301-10/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flac: use get_bits_longlong()Paul B Mahol2012-09-301-2/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | tta: let samples declaration match castPaul B Mahol2012-09-301-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | bitstream: add get_bits_longlong() to support more than 32bitsMichael Niedermayer2012-09-301-0/+18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: disable buffering for stderr, needed for win32 runtimeThe makemkv authors2012-09-301-0/+2
| | | | | | | | | | | | | | Found in http://www.makemkv.com/download/ffmpeg/mmffmpeg-1.7.7.patch.gz Commit message by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-302-9/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: h264: avoid stuck buffer pointer in decode_nal_units mpeg12: fix the semantics of the int* parameter of decode() Conflicts: libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: avoid stuck buffer pointer in decode_nal_unitsJindřich Makovička2012-09-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decode_nal_units() previously encountered a NAL_END_SEQUENCE, and there are some junk bytes left in the input buffer, but no start codes, buf_index gets stuck 3 bytes before the end of the buffer. This can trigger an infinite loop in the caller code, eg. in try_decode_trame(), as avcodec_decode_video() then keeps returning zeroes, with 3 bytes of the input packet still available. With this change, the remaining bytes are skipped so the whole packet gets consumed. CC:libav-stable@libav.org Signed-off-by: Jindřich Makovička <makovick@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mpeg12: fix the semantics of the int* parameter of decode()Anton Khirnov2012-09-291-6/+6
| | | | | | | | It is got_output, not data_size.
* | Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'Michael Niedermayer2012-09-302-58/+54
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23': mpeg12: move mpeg_decode_frame() lower avsdec: Set dimensions instead of relying on the demuxer. wmalosslessdec: Reset put bit buffer when num_saved_bits is reset. Conflicts: libavcodec/avs.c libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: move mpeg_decode_frame() lowerAnton Khirnov2012-09-291-48/+44
| | | | | | | | Avoids a forward declaration of decode_chunks().
| * avsdec: Set dimensions instead of relying on the demuxer.Michael Niedermayer2012-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | The decode function assumes that the video will have those dimensions. Fixes CVE-2012-2801 CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.Michael Niedermayer2012-09-291-0/+2
| | | | | | | | | | | | | | | | | | Fixes CVE-2012-2799 CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'Michael Niedermayer2012-09-306-27/+35
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6': dfa: improve boundary checks in decode_dds1() wmalosslessdec: Fix reading too many bits in decode_channel_residues() wmalosslessdec: fix a get_bits(0) in decode_ac_filter wmalosslessdec: make MCLMS arrays big enough for what is written into them. indeo4/5: check empty tile size in decode_mb_info(). ivi_common: make ff_ivi_process_empty_tile() static. indeo5: check tile size in decode_mb_info(). indeo3: fix out of cell write. Conflicts: libavcodec/dfa.c libavcodec/indeo3.c libavcodec/indeo5.c libavcodec/ivi_common.c libavcodec/wmalosslessdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dfa: improve boundary checks in decode_dds1()Anton Khirnov2012-09-291-4/+6
| | | | | | | | | | | | Fixes CVE-2012-2798 CC:libav-stable@libav.org
| * wmalosslessdec: Fix reading too many bits in decode_channel_residues()Anton Khirnov2012-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes a part of CVE-2012-2795 CC:libav-stable@libav.org Based on a patch by Michael Niedermayer <michaelni@gmx.at> Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * wmalosslessdec: fix a get_bits(0) in decode_ac_filterMichael Niedermayer2012-09-291-1/+2
| | | | | | | | | | | | | | | | | | Fixes a part of CVE-2012-2795 CC:libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Anton Khirnov <anton@khirnov.net>
OpenPOWER on IntegriCloud