aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-252-2/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add a new option 'rtmp_pageurl' doc: Update the description of the rtmp_tcurl option rtmp: Make the description of the rtmp_tcurl option more generic libfdk-aacenc: add LATM/LOAS encapsulation support sctp: add port missing error message tcp: add port missing error message avfilter: Fix printf format string conversion specifier Conflicts: libavcodec/version.h libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libfdk-aacenc: add LATM/LOAS encapsulation supportKieran Kunhya2012-07-252-2/+15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | libvpxenc: switch to av_assertMichael Niedermayer2012-07-251-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | intrax8: asserts cleanupMichael Niedermayer2012-07-251-13/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix avui stream-copy.Carl Eugen Hoyos2012-07-251-4/+16
| | | | | | | | | | | | The native decoder and MPlayer's binary decoder only need the APRG atom, QuickTime at least requires also the ARES atom and four additional 0 bytes padding at the end of stsd.
* | imgconvert: Implement avcodec_find_best_pix_fmt_of_list()Michael Niedermayer2012-07-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | The old avcodec_find_best_pix_fmt() was insufficient due to 64 pix_fmt limit. In ffmpeg this problem has been solved long ago through avcodec_find_best_pix_fmt2() Today libav has added a incompatible modified version of avcodec_find_best_pix_fmt2() under the same name, thus again breaking ABI/API ... The avcodec_find_best_pix_fmt_of_list() added in this commit here makes the libav API available to ffmpeg users too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libopenjpegenc: set numresolution max to INT_MAXMichael Bradshaw2012-07-251-5/+5
| | | | | | | | | | | | | | OpenJPEG doesn't have a max lowres limit, so don't enforce an arbitrary one. Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code rtmp: Move the CONFIG_ condition into the if conditions aac: Mention abbreviation as well in long_name build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled doc: Add Git configuration section configure: Add a dependency on https for rtmpts rtp: Only choose static payload types if the sample rate and channels are right Conflicts: doc/git-howto.texi libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Mention abbreviation as well in long_nameDiego Biurrun2012-07-241-1/+1
| | | | | | | | Most people know the codec as "AAC" and not "Advanced Audio Coding".
* | iffdec: Fix integer overflow.Michael Niedermayer2012-07-241-0/+5
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: dont apply the loop filter on fieldsMichael Niedermayer2012-07-241-1/+1
| | | | | | | | | | | | Fixes read of uninitialized memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: dont attempt error concealment on field pictures.Michael Niedermayer2012-07-241-1/+2
| | | | | | | | | | | | This is not implemented and doesnt work. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ec: print picture type with concealment error message.Michael Niedermayer2012-07-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil_mmx: fix incorrect assembly codeyang2012-07-241-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | In file libavcodec/x86/dsputil_mmx.c, function ff_put_pixels_clamped_mmx(), there are two assembly code blocks. In the first block (in the unrolled loop), the instructions "movq 8%3, %%mm1 \n\t" etc have problem. For above instruction, it is clear what the programmer wants: a load from p + 8. But this assembly code doesn’t guarantee that. It only works if the compiler puts p in a register to produce an instruction like this: “movq 8(%edi), %mm1”. During compiler optimization, it is possible that the compiler will be able to constant propagate into p. Suppose p = &x[10000]. Then operand 3 can become 10000(%edi), where %edi holds &x. And the instruction becomes “movq 810000(%edx)”. That is, it will stride by 810000 instead of 8. This will cause the segmentation fault. This error was fixed in the second block of the assembly code, but not in the unrolled loop. How to reproduce: This error is exposed when we build the ffmpeg using Intel C++ Compiler, IPO+PGO optimization. The ffmpeg was crashed when decoding a mjpeg video. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: switch to av_assertMichael Niedermayer2012-07-231-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/bitstream: switch to av_assertMichael Niedermayer2012-07-231-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix typo in v410 decoder.Carl Eugen Hoyos2012-07-231-2/+2
| |
* | cosmetics: iff: fix typoPaul B Mahol2012-07-231-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | fate: enable fate-vc1_sa10143Michael Niedermayer2012-07-231-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-235-82/+97
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: v410dec: Implement explode mode support zerocodec: fix direct rendering. wav: init st to NULL to avoid a false-positive warning. wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit h264: refactor NAL decode loop RTMPTE protocol support RTMPE protocol support rtmp: Add ff_rtmp_calc_digest_pos() rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global swscale: add missing HAVE_INLINE_ASM check. lavfi: place x86 inline assembly under HAVE_INLINE_ASM. vc1: Add a test for interlaced field pictures swscale: Mark all init functions as av_cold swscale: x86: Drop pointless _mmx suffix from filenames lavf: use conditional notation for default codec in muxer declarations. swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM. dsputil: ppc: cosmetics: pretty-print dsputil: x86: add SHUFFLE_MASK_W macro configure: respect CC_O setting in check_cc Conflicts: Changelog configure libavcodec/v410dec.c libavcodec/zerocodec.c libavformat/asfenc.c libavformat/version.h libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v410dec: Implement explode mode supportDerek Buitenhuis2012-07-231-2/+6
| | | | | | | | | | | | | | Try and decode broken files, but still fail if explode mode is enabled. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * zerocodec: fix direct rendering.Reimar Döffinger2012-07-231-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | Set picture type before calling get_buffer. This allows the DR application to make better decisions. It also fixes a resource leak in case of missing reference frames since it would call get_buffer but never release_buffer. Also use FFSWAP to ensure that the AVFrame is properly initialized in the next get_buffer (in particular that data[0] is NULL). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bitHendrik Leppkes2012-07-231-0/+1
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * h264: refactor NAL decode loopRonald S. Bultje2012-07-231-17/+25
| | | | | | | | | | | | | | | | | | | | Write out the NAL decoding loops in full so that they are easier to parse for a preprocessor without it having to be aware of macros or other such things in C code. This also makes the code more readable. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * dsputil: ppc: cosmetics: pretty-printJustin Ruggles2012-07-221-62/+64
| |
| * dsputil: x86: add SHUFFLE_MASK_W macroJason Garrett-Glaser2012-07-221-1/+1
| | | | | | | | Simplifies pshufb masks that operate on words.
* | iff: set ham palette alpha to 0xFFPeter Ross2012-07-231-9/+9
| | | | | | | | | | | | | | This addresses the problem that some HAM pictures were decoded with complete transparency as described in the 'iff: ANIM suppport ' thread on ffmpeg-devel. The decoder was already setting alpha correctly for CMAP palettes, just not HAM palettes.
* | libschroedingerenc: remove assert related to the old API.Michael Niedermayer2012-07-231-1/+0
| | | | | | | | | | | | | | The assert is no longer needed as the buffer is allocated after the size is known now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvorbisenc: switch to av_assertMichael Niedermayer2012-07-231-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libschroedingerenc: switch to av_assertMichael Niedermayer2012-07-231-5/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g723.1dec: Make postfilter user switchableMichael Niedermayer2012-07-231-1/+22
| | | | | | | | | | | | | | Code from qatar (55c3a4f617171ad1138df684cbafa570807bc6a9) Author of the code was probably Mohamed or Kostya Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g723.1: various cosmetics and changes that should have no user vissible effect.Michael Niedermayer2012-07-232-37/+43
| | | | | | | | | | | | | | code from qatar (55c3a4f617171ad1138df684cbafa570807bc6a9) Author of the code was probably Mohamed or Kostya Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'Michael Niedermayer2012-07-229-127/+137
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea': Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer G.723.1 demuxer and decoder Add a shift parameter to celp_lp_synthesis_filter() libopenjpeg: K&R formatting cosmetics yadif: use emms_c() instead of inline assembly for emms invocations. ac3: don't use different names for option tables in the template file. lavfi: use const for AVFilterPad declarations in all filters. adpcm: don't duplicate identical AVSampleFmt array for each encoder. configure: cosmetics: Group test dependencies together configure: add more passthrough flags in tms470 filter configure: move flag filtering functions out of if/else blocks Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/ac3enc_fixed.c libavcodec/allcodecs.c libavcodec/eac3enc.c libavcodec/g723_1.c libavcodec/g723_1_data.h libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/v210dec.h libavcodec/version.h libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_pixdesctest.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vf_showinfo.c libavfilter/vf_slicify.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/Makefile libavformat/allformats.c libavformat/g723_1.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxerKostya Shishkov2012-07-221-1/+1
| |
| * G.723.1 demuxer and decoderMohamed Naufal Basheer2012-07-224-0/+2372
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * Add a shift parameter to celp_lp_synthesis_filter()Mohamed Naufal Basheer2012-07-223-4/+5
| | | | | | | | | | | | This is intended for reuse by the G.723.1 decoder Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * libopenjpeg: K&R formatting cosmeticsLuca Barbato2012-07-222-85/+96
| |
| * ac3: don't use different names for option tables in the template file.Ronald S. Bultje2012-07-213-8/+2
| | | | | | | | | | The variables which are declared in the teplate file are static and therefore there is no symbol clash.
| * adpcm: don't duplicate identical AVSampleFmt array for each encoder.Ronald S. Bultje2012-07-211-2/+4
| |
* | atrac3: switch to av_assertMichael Niedermayer2012-07-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | kbdwin: switch to av_assertMichael Niedermayer2012-07-221-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tscc: employ more meaningful return valuesPaul B Mahol2012-07-221-8/+8
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pthread: mark lockless thread synchronization variables as volatileMichael Niedermayer2012-07-221-8/+9
| | | | | | | | | | | | No speed difference was meassureable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | zerocodec: fix direct rendering.Reimar Döffinger2012-07-211-17/+17
| | | | | | | | | | | | | | | | | | | | | | Set picture type before calling get_buffer. This allows the DR application to make better decisions. It also fixes a resource leak in case of missing reference frames since it would call get_buffer but never release_buffer. Also use FFSWAP to ensure that the AVFrame is properly initialized in the next get_buffer (in particular that data[0] is NULL). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | libopenjpegdec: set cp_reduce value only oncePaul B Mahol2012-07-211-1/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | alacdec: fix packed sample output with 5.1Michael Niedermayer2012-07-211-3/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ac3dec: set decode_error_flags field in ac3 codecMarton Balint2012-07-211-0/+2
| | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add decode_error_flags field to AVFrameMarton Balint2012-07-213-1/+17
| | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-212-5/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libopenjpeg: introduce lowres and lowqual private options FATE: add a test for flac cover art. cafdec: allow larger ALAC magic cookie alac: fix channel pointer assignment for 24 and 32-bit Conflicts: libavcodec/alac.c libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopenjpeg: introduce lowres and lowqual private optionsLuca Barbato2012-07-201-0/+28
| | | | | | | | | | OpenJPEG can decode in lower resolution or decode only a number of enhancement layers.