aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | lavc: add avcodec_is_open().Anton Khirnov2012-01-315-4/+20
| | | | | | | | | | | | | | | | | | | | | It allows to check whether an AVCodecContext is open in a documented way. Right now the undocumented way this check is done in lavf/lavc is by checking whether AVCodecContext.codec is NULL. However it's desirable to be able to set AVCodecContext.codec before avcodec_open2().
| * | lavf: rename AVInputFormat.value to raw_codec_id.Anton Khirnov2012-01-3112-24/+24
| | | | | | | | | | | | It's only used by raw demuxers for storing the codec id.
| * | lavf: remove the pointless value field from flv and iv8Anton Khirnov2012-01-312-2/+0
| | | | | | | | | | | | The demuxers don't use it in any way.
| * | lavc/lavf: remove unnecessary symbols from the symbol version script.Anton Khirnov2012-01-312-27/+0
| | |
| * | lavc: reorder AVCodec fields.Anton Khirnov2012-01-311-16/+23
| | | | | | | | | | | | | | | | | | | | | Put all private fields at the end and mark them as such so they can be easily changed/removed. This breaks ABI.
| * | lavf: reorder AVInput/OutputFormat fields.Anton Khirnov2012-01-311-49/+61
| | | | | | | | | | | | | | | | | | | | | Put all private fields at the end and mark them as such so they can be easily changed/removed. This breaks ABI.
| * | mp3dec: Fix a heap-buffer-overflowAlex Converse2012-01-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | In some cases, what is left to read from ptr is smaller than EXTRABYTES. Based on a patch by Thierry Foucu <tfoucu@gmail.com>. Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | adpcmenc: remove some unneeded castsJustin Ruggles2012-01-301-4/+4
| | |
| * | adpcmenc: use int16_t and uint8_t instead of short and unsigned char.Justin Ruggles2012-01-302-23/+24
| | |
| * | adpcmenc: fix adpcm_ms extradata allocationJustin Ruggles2012-01-301-3/+3
| | | | | | | | | | | | | | | | | | Add FF_INPUT_BUFFER_PADDING_SIZE. If allocation fails, also free memory which was allocated previously in adpcm_encode_init().
| * | adpcmenc: return proper AVERROR codes instead of -1Justin Ruggles2012-01-301-6/+13
| | |
| * | adpcmenc: check for coded_frame allocation failureJustin Ruggles2012-01-301-1/+2
| | |
| * | adpcmenc: Do not set coded_frame->key_frame.Justin Ruggles2012-01-301-1/+0
| | | | | | | | | | | | It is already set in avcodec_alloc_frame().
| * | mpc7: check for allocation failureJustin Ruggles2012-01-301-0/+2
| | |
| * | mpc7: align local temp bufferJustin Ruggles2012-01-301-1/+1
| | | | | | | | | | | | DSPContext.bswap_buf() requires aligned output
| * | rv40: x86 SIMD for biweightChristophe Gisquet2012-01-303-1/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide MMX, SSE2 and SSSE3 versions, with a fast-path when the weights are multiples of 512 (which is often the case when the values round up nicely). *_TIMER report for the 16x16 and 8x8 cases: C: 9015 decicycles in 16, 524257 runs, 31 skips 2656 decicycles in 8, 524271 runs, 17 skips MMX: 4156 decicycles in 16, 262090 runs, 54 skips 1206 decicycles in 8, 262131 runs, 13 skips MMX on fast-path: 2760 decicycles in 16, 524222 runs, 66 skips 995 decicycles in 8, 524252 runs, 36 skips SSE2: 2163 decicycles in 16, 262131 runs, 13 skips 832 decicycles in 8, 262137 runs, 7 skips SSE2 with fast path: 1783 decicycles in 16, 524276 runs, 12 skips 711 decicycles in 8, 524283 runs, 5 skips SSSE3: 2117 decicycles in 16, 262136 runs, 8 skips 814 decicycles in 8, 262143 runs, 1 skips SSSE3 with fast path: 1315 decicycles in 16, 524285 runs, 3 skips 578 decicycles in 8, 524286 runs, 2 skips This means around a 4% speedup for some sequences. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | x86: Give RV40 init file a more suitable name.Diego Biurrun2012-01-302-1/+1
| | |
| * | x86: Place mm_flags variable declaration below the appropriate #ifdef.Diego Biurrun2012-01-302-3/+3
| | | | | | | | | | | | This fixes some unused variable warnings with YASM disabled.
| * | movdec: Ignore sample_degradation_priority bits when checking first_sample_flagsMartin Storsjö2012-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the first packet of a track fragment run to get the keyframe flag set properly if sample_degradation_priority is nonzero. This makes the keyframes flag be set properly for ismv files created by Microsoft. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | flvdec: Interpret a toplevel 'object' type metadata item as normal metadata, tooMartin Storsjö2012-01-301-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we've only passed the key string on to the recursive amf_parse_object for the mixedarray type, not for 'object'. By passing the key string on, the recursive amf_parse_object can store the amf objects as metadata. This kind of data was seen in data from XSplit Broadcaster, received over RTMP via Wowza. This patch allows reading this metadata. Signed-off-by: Martin Storsjö <martin@martin.st>
* | | ffv1dec: use correct linesizePaul B Mahol2012-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | Apparently this did not break anything. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2012-01-311-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | * shariman/wmall: Cosmetics: Fix some whitespace errors and indentation Use correct variable type for 32-bit samples buffer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Cosmetics: Fix some whitespace errors and indentationMashiat Sarker Shakkhar2012-01-271-3/+3
| | |
| * | Use correct variable type for 32-bit samples bufferMashiat Sarker Shakkhar2012-01-221-2/+2
| | |
* | | ffv1dec: PIX_FMT_YUVA444P supportPaul B Mahol2012-01-311-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffv1enc: PIX_FMT_YUVA444P supportPaul B Mahol2012-01-311-1/+2
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffv1dec: PIX_FMT_YUVA420P supportPaul B Mahol2012-01-311-1/+10
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffv1enc: PIX_FMT_YUVA420P supportPaul B Mahol2012-01-311-1/+7
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mpeg/h264: update thread context even if it is not initialized.Michael Niedermayer2012-01-312-9/+14
| | | | | | | | | | | | | | | | | | | | | Fixes decoding of Ticket952 Tested-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | h264: Return the correct number of bytes for mid strea, extradata.Michael Niedermayer2012-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | Fixes the hang with Ticket952 Tested-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | pngdec: fix warning about pointer typesMichael Niedermayer2012-01-311-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffmpeg: fix -map_channel being ignored when resampling is not needed.Clément Bœsch2012-01-311-1/+1
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-3125-303/+608
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) avconv: deprecate the -deinterlace option doc: Fix the name of the new function aacenc: make sure to encode enough frames to cover all input samples. aacenc: only use the number of input samples provided by the user. wmadec: Verify bitstream size makes sense before calling init_get_bits. kmvc: Log into a context at a log level constant. mpeg12: Pad framerate tab to 16 entries. kgv1dec: Increase offsets array size so it is large enough. kmvc: Check palsize. nsvdec: Propagate errors nsvdec: Be more careful with av_malloc(). nsvdec: Fix use of uninitialized streams. movenc: cosmetics: Get rid of camelCase identifiers swscale: more generic check for planar destination formats with alpha doc: Document mov/mp4 fragmentation options build: Use order-only prerequisites for creating FATE reference file dirs. x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf rtsp: Remove some unused variables from ff_rtsp_connect(). avutil: make intfloat api public avformat_write_header(): detail error message ... Conflicts: doc/APIchanges doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/kmvc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_yasm.asm libavcodec/x86/pngdsp-init.c libavformat/movenc.c libavformat/movenc.h libavformat/mpegtsenc.c libavformat/nsvdec.c libavformat/utils.c libavutil/avutil.h libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avconv: deprecate the -deinterlace optionAnton Khirnov2012-01-302-2/+11
| | | | | | | | | | | | Its quality is horrible, yadif should always be used instead.
| * | doc: Fix the name of the new functionMartin Storsjö2012-01-301-1/+1
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | aacenc: make sure to encode enough frames to cover all input samples.Justin Ruggles2012-01-301-7/+5
| | | | | | | | | | | | | | | | | | Currently, any samples in the final frame are not decoded because they are only represented by one frame instead of two. So we encode two final frames to cover both the analysis delay and the MDCT delay.
| * | aacenc: only use the number of input samples provided by the user.Justin Ruggles2012-01-301-3/+5
| | | | | | | | | | | | Fixes handling of CODEC_CAP_SMALL_LAST_FRAME.
| * | wmadec: Verify bitstream size makes sense before calling init_get_bits.Alex Converse2012-01-301-0/+2
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * | kmvc: Log into a context at a log level constant.Alex Converse2012-01-301-1/+2
| | |
| * | mpeg12: Pad framerate tab to 16 entries.Alex Converse2012-01-301-1/+1
| | | | | | | | | | | | | | | | | | There are many places where we read an unchecked 4-bit index into it. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * | kgv1dec: Increase offsets array size so it is large enough.Michael Niedermayer2012-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2011-3945 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 807a045ab7f51993a2c1b3116016cbbd4f3d20d6) Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | kmvc: Check palsize.Alex Converse2012-01-301-1/+6
| | | | | | | | | | | | | | | | | | | | | Fixes: CVE-2011-3952 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Based on fix by Michael Niedermayer
| * | nsvdec: Propagate errorsAlex Converse2012-01-301-1/+6
| | | | | | | | | | | | | | | | | | Related to CVE-2011-3940. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * | nsvdec: Be more careful with av_malloc().Alex Converse2012-01-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check results for av_malloc() and fix an overflow in one call. Related to CVE-2011-3940. Based in part on work from Michael Niedermayer. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * | nsvdec: Fix use of uninitialized streams.Michael Niedermayer2012-01-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2011-3940 (Out of bounds read resulting in out of bounds write) Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5c011706bc752d34bc6ada31d7df2ca0c9af7c6b) Signed-off-by: Alex Converse <alex.converse@gmail.com>
| * | movenc: cosmetics: Get rid of camelCase identifiersMartin Storsjö2012-01-302-151/+152
| | | | | | | | | | | | | | | | | | | | | Also add spacing around operators on touched lines, and split one line to match the common style. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | swscale: more generic check for planar destination formats with alphaPaul B Mahol2012-01-301-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | doc: Document mov/mp4 fragmentation optionsMartin Storsjö2012-01-301-0/+61
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | build: Use order-only prerequisites for creating FATE reference file dirs.Diego Biurrun2012-01-301-8/+6
| | |
| * | x86 dsputil: provide SSE2/SSSE3 versions of bswap_bufChristophe Gisquet2012-01-302-0/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While pshufb allows emulating bswap on XMM registers for SSSE3, more shuffling is needed for SSE2. Alignment is critical, so specific codepaths are provided for this case. For the huffyuv sequence "angels_480-huffyuvcompress.avi": C (using bswap instruction): ~ 55k cycles SSE2: ~ 40k cycles SSSE3 using unaligned loads: ~ 35k cycles SSSE3 using aligned loads: ~ 30k cycles Signed-off-by: Diego Biurrun <diego@biurrun.de>