summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'Michael Niedermayer2013-05-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487': avcodec: Add av_cold attributes to init functions missing them Conflicts: libavcodec/aacpsy.c libavcodec/atrac3.c libavcodec/dvdsubdec.c libavcodec/ffv1.c libavcodec/ffv1enc.c libavcodec/h261enc.c libavcodec/h264_parser.c libavcodec/h264dsp.c libavcodec/h264pred.c libavcodec/libschroedingerenc.c libavcodec/libxvid_rc.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/proresdsp.c libavcodec/rangecoder.c libavcodec/videodsp.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Add av_cold attributes to init functions missing themDiego Biurrun2013-05-04
| |
* | Detect and skip mj2-style jp2c header.Reimar Döffinger2013-05-05
| | | | | | | | | | | | | | | | | | This this fixes one of the issues with http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip and at least allows to demux the file properly instead of failing during probing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | AAC encoder: Fix rate control on twoloop.Claudio Freire2013-05-05
| | | | | | | | | | | | | | | | Fixes a case where multichannel bitrate isn't accurately targetted by psy model alone, never achieving the target bitrate. Now fixed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.Claudio Freire2013-05-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xbmdec: fix off by one error in scanf()Michael Niedermayer2013-05-05
| | | | | | | | | | | | Fixes out of array access Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: Always decode MMCOs into temprary arrayMichael Niedermayer2013-05-04
| | | | | | | | | | | | | | | | | | When decoding succeeded the array is copied into the permanent one. This prevents inconsistencies Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmaprodec: Fix null pointer dereference in decode_frame()Michael Niedermayer2013-05-04
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dfa: Put our pointer check back.Michael Niedermayer2013-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The reimplementation by Libav does not prevent out of array writes, even though it looks like it does at a quick glance. No FFmpeg releases are affected by this See: d1c95d2ce39560e251fdb14f4af91b04fd7b845c 3623589edc7b1257bb45aa9e52c9631e133f22b6 740ebe468c0567cac03ef7e6b4b9fd0253b97da2 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacdec: free frame buffer if no audio was decodedHendrik Leppkes2013-05-04
| | | | | | | | | | | | | | | | | | If no decoding error was detected, but still no audio was decoded, the frame needs to be free'ed, or it will leak. Fixes part of ticket #2095 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'Michael Niedermayer2013-05-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * silly typo fixesDiego Biurrun2013-05-03
| |
* | Merge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'Michael Niedermayer2013-05-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a7af92cc80ced8498626401ed21f25ffe6740c8': sbrdsp: Unroll and use integer operations sbrdsp: Unroll sbr_autocorrelate_c x86: sbrdsp: Implement SSE2 qmf_deint_bfly Conflicts: libavcodec/sbrdsp.c libavcodec/x86/sbrdsp.asm libavcodec/x86/sbrdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sbrdsp: Unroll and use integer operationsChristophe Gisquet2013-05-03
| | | | | | | | | | | | | | | | | | | | | | | | This patch can be controversial, by assuming floats are IEEE-754 and particular behaviour of the FPU will get in the way. Timing on Arrandale and Win32 (thus, x87 FPU is used in the reference). sbr_qmf_pre_shuffle_c: 115 to 76 sbr_neg_odd_64_c: 84 to 55 sbr_qmf_post_shuffle_c: 112 to 83 Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * sbrdsp: Unroll sbr_autocorrelate_cChristophe Gisquet2013-05-03
| | | | | | | | | | | | 1410 cycles to 1148 on Arrandale/Win64 Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * x86: sbrdsp: Implement SSE2 qmf_deint_bflyChristophe Gisquet2013-05-03
| | | | | | | | | | | | | | | | | | | | Sandybridge: 47 cycles Having a loop counter is a 7 cycle gain. Unrolling is another 7 cycle gain. Working in reverse scan is another 6 cycles. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | evrcdec: fix sign errorMichael Niedermayer2013-05-04
| | | | | | | | | | | | | | | | | | | | The specification wants round(abs(x))) * sign(x) which is equivakent to round(x) Fixes out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | snow: Fix off by 1 error in reference picture managementMichael Niedermayer2013-05-04
| | | | | | | | | | | | | | | | Fixes out of array accesses No release is affected by this bug Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | eamad: Check against minimum supported dimensionsMichael Niedermayer2013-05-03
| | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: fix lutuv use in vc1_mc_4mv_chroma4()Michael Niedermayer2013-05-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: Fix mixed field/frame intensity compensationMichael Niedermayer2013-05-03
| | | | | | | | | | | | Fixes Ticket2523 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: vc1_mc_4mv_chroma4: match addressing between compensation and MCMichael Niedermayer2013-05-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | * commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a': vc1_parser: Set field_order. mpegvideo_parser: Set field_order. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1_parser: Set field_order.Masaki Tanaka2013-05-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mpegvideo_parser: Set field_order.Masaki Tanaka2013-05-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | | | | | | | * commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5': avcodec: Add field order information to AVCodecParserContext. Conflicts: doc/APIchanges libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Add field order information to AVCodecParserContext.Masaki Tanaka2013-05-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec: move lowres down with the next ABI bump and add accessorsMichael Niedermayer2013-05-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '803d21f38bdafe7c4e2571a9ae7052013a12923b'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | | | | | * commit '803d21f38bdafe7c4e2571a9ae7052013a12923b': lavc: schedule AVCodecContext.lowres for removal on next bump. Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: schedule AVCodecContext.lowres for removal on next bump.Anton Khirnov2013-05-03
| | | | | | | | | | It has been deprecated some time ago, but was forgotten during the last bump.
* | Merge commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec': aac: Remove aacpsy.h header, unused since 78e65cd7726 cavs: Remove cavsdata.h header, unused since 88386feefd Conflicts: libavcodec/aacpsy.h libavcodec/cavsdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Remove aacpsy.h header, unused since 78e65cd7726Diego Biurrun2013-05-02
| |
| * cavs: Remove cavsdata.h header, unused since 88386feefdDiego Biurrun2013-05-02
| |
* | Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | | | | | * commit 'bf7c3c6b157f7938578f964b62cffd5e504940be': x86: dsputil: Move cavs and vc1-specific functions where they belong Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil: Move cavs and vc1-specific functions where they belongDiego Biurrun2013-05-02
| |
* | Merge commit '932806232108872655556100011fe369125805d3'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | * commit '932806232108872655556100011fe369125805d3': x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.cDiego Biurrun2013-05-02
| | | | | | | | | | The function does not do any rounding, so there is no point in keeping it in a round template file.
| * x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.cDiego Biurrun2013-05-02
| | | | | | | | | | The function is only instantiated once, so there is no point in keeping it in a template file.
* | Merge commit '9b3a04d30691e85b77e63f75f5f26a93c3a000cd'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | * commit '9b3a04d30691e85b77e63f75f5f26a93c3a000cd': x86: Move duplicated put_pixels{8|16}_mmx functions into their own file Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Move duplicated put_pixels{8|16}_mmx functions into their own fileDiego Biurrun2013-05-02
| |
* | mmvideo/mm_decode_intra: check horizontal coordinate tooMichael Niedermayer2013-05-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mmvideo/mm_decode_inter: check horizontal coordinate tooMichael Niedermayer2013-05-02
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ape_decode_value_3860: check k before using it in get_bits()Michael Niedermayer2013-05-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ape_decode_value_3900: check tmpkMichael Niedermayer2013-05-02
| | | | | | | | | | | | | | Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vmdav: unbreak decoding of samples from game The Last DynastyPaul B Mahol2013-05-02
| | | | | | | | | | | | | | | | | | This fixes video output with samples HG060808.VMD and HG060810.VMD. Regression since c0cbe36b18ab3e. While here show warning if decoding is aborted for some reason. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | vmdav: return meaningful error codesPaul B Mahol2013-05-02
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-05-02
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Add wmv2 dependency to vc1 compilation. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Add wmv2 dependency to vc1 compilation.Carl Eugen Hoyos2013-05-02
| | | | | | | | | | | | Fixes compilation with --disable-everything --enable-decoder=vc1.
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-02
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | * qatar/master: id3v2: K&R formatting cosmetics ppc: Only compile AltiVec FFT assembly when AltiVec is enabled Conflicts: libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ppc: Only compile AltiVec FFT assembly when AltiVec is enabledDiego Biurrun2013-05-02
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 15:45:23 +0000