summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'Michael Niedermayer2012-10-13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723': rtpdec_xiph: fix function return type smjpeg: fix type of 'ret' variable in smjpeg_read_packet() mpegvideo: remove write-only variable Use proper return values in case of missing features fate: add avstring test rangecoder-test: Set error message log level to error, instead of debug Conflicts: libavcodec/aacdec.c libavcodec/amrnbdec.c libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove write-only variableMans Rullgard2012-10-12
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Use proper return values in case of missing featuresDiego Biurrun2012-10-12
| |
| * rangecoder-test: Set error message log level to error, instead of debugDiego Biurrun2012-10-12
| |
* | Merge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | * commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0': rangecoder: K&R formatting cosmetics Conflicts: libavcodec/rangecoder.c libavcodec/rangecoder.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rangecoder: K&R formatting cosmeticsDiego Biurrun2012-10-12
| |
* | Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca411fc1d34329cd17b28627f697e391ae52073f': avcodec: Remove broken MMI optimizations Conflicts: arch.mak configure libavcodec/avcodec.h libavcodec/mips/Makefile libavcodec/mips/dsputil_mmi.c libavcodec/mips/idct_mmi.c libavcodec/mips/mmi.h libavcodec/mips/mpegvideo_mmi.c libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Remove broken MMI optimizationsDiego Biurrun2012-10-12
| | | | | | | | The code fails to compile and is broken beyond repair.
* | Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be': Remove libmpeg2 #define remnants De-doxygenize some top-level files Conflicts: ffmpeg.c ffmpeg.h ffmpeg_filter.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove libmpeg2 #define remnantsDiego Biurrun2012-10-12
| |
* | Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd5c62122a7b26704bf867a1262df358623bf5edf': Move av_reverse table to libavcodec Conflicts: libavcodec/asvenc.c libavcodec/vble.c libavutil/common.h libavutil/mathematics.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move av_reverse table to libavcodecDiego Biurrun2012-10-12
| | | | | | | | It is only used in that library.
* | Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | * commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066': avutil: Duplicate ff_log2_tab instead of sharing it across libs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Duplicate ff_log2_tab instead of sharing it across libsDiego Biurrun2012-10-12
| | | | | | | | | | The table is so small that the space gain is not worth the performance overhead of cross-library access.
| * tscc2: Fix an out of array accessMichael Niedermayer2012-10-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vp8: reset loopfilter delta values at keyframes.Sami Pietila2012-10-12
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * avutil: add yuva422p and yuva444p formatsLuca Barbato2012-10-12
| |
* | vp8dec: reset loopfilter delta values at keyframesSami Pietilä2012-10-13
| | | | | | | | | | | | | | | | | | while testing a VP8 encoder I found a mismatch between FFMPEG and libvpx VP8 decoders. The reason for this mismatch is that FFMPEG doesn't reset loopfilter delta values at keyframes. Patch that fixes the issue is below. I've verified that the output of ffmpeg after this patch matches libvpx. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pcxenc: store sample aspect ratioPaul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pcx: read sample aspect ratioPaul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | bethsoftvideo: return meaningfull error codesPaul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | truemotion2: use more meaningful return codesPaul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | jpegls: increase run_index to 4Michael Niedermayer2012-10-13
| | | | | | | | | | Fixes part of CID717913 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpegls: fix off limitMichael Niedermayer2012-10-13
| | | | | | | | | | Fixes part of CID717913 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rv30_decode_intra_types: make check tighterMichael Niedermayer2012-10-13
| | | | | | | | | | | | | | This makes no differnce as the affected values cannot occur But it will likely help static analyzers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_celp_lp_synthesis_filterf: change loop end checkMichael Niedermayer2012-10-13
| | | | | | | | | | | | | | | | This makes no difference for supported input but avoids a out of array read with input that is never passed in currently Fixes CID717919 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_celp_lp_synthesis_filterf: check that filter_length is within the ↵Michael Niedermayer2012-10-13
| | | | | | | | | | | | supported range Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: avoid checking a double for equalityMichael Niedermayer2012-10-13
| | | | | | | | | | | | | | | | | | if 0.0 != 0.0 a out of array read would occur, equal checks with floating point may behave in such odd ways, though this is very unlikely in a real implementation of a compiler Fixes: CID718936 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: change order of operation to prevent out of array readMichael Niedermayer2012-10-13
| | | | | | | | | | Fixes CID732250 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix writing 12 bit DPXGeorg Lippitsch2012-10-13
| | | | | | | | | | | | | | | | The DPX encoder now writes 12 DPX that open correctly (tested with ImageMagick), and also correspond to the 12 bit sample files at http://samples.ffmpeg.org/image-samples/dpx_samples.zip Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix DPX decoderGeorg Lippitsch2012-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the DPX decoder to work with provided sample DPXs at http://samples.ffmpeg.org/image-samples/dpx_samples.zip The decoder could only decode 8 and 10 bit without alpha correctly, failing or even crashing at other flavors. This patch aims to fix these issues, properly decoding all variants of DPX provided in the referenced DPX sample zip. For 10 and 12 bit, the alpha channel is ignored, but decoding is still possible. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg4videodec: disable frame multithreading for GMC, its not implemented at allMichael Niedermayer2012-10-12
| | | | | | | | | | | | This fixes race conditions in decoding MPEG-4 GMC files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | motion_est: more complete SAB diamond size checkMichael Niedermayer2012-10-12
| | | | | | | | | | | | | | This makes no difference with the current #defines Fixes CID732255 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | exr: fix twin ;Michael Niedermayer2012-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: do not use av_pix_fmt_descriptors directlyPaul B Mahol2012-10-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5'Michael Niedermayer2012-10-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50ba57e0ce63d9904269ea0728936a0c79f8bfb5': lavc: do not use av_pix_fmt_descriptors directly. Conflicts: libavcodec/imgconvert.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/mpegvideo.c libavcodec/rawdec.c libavcodec/rawenc.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: do not use av_pix_fmt_descriptors directly.Anton Khirnov2012-10-12
| |
| * mpegvideo: fix indentationAnton Khirnov2012-10-12
| |
* | Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'Michael Niedermayer2012-10-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e002e3291e6dc7953f843abf56fc14f08f238b21': Use the new aes/md5/sha/tree allocation functions avutil: Add functions for allocating opaque contexts for algorithms svq3: fix pointer type warning svq3: replace unsafe pointer casting with intreadwrite macros parseutils-test: various cleanups Conflicts: doc/APIchanges libavcodec/svq3.c libavutil/parseutils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use the new aes/md5/sha/tree allocation functionsMartin Storsjö2012-10-11
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * svq3: fix pointer type warningMans Rullgard2012-10-11
| | | | | | | | | | | | | | | | Fixes: libavcodec/svq3.c:661:9: warning: passing argument 2 of 'svq3_decode_block' from incompatible pointer type libavcodec/svq3.c:208:19: note: expected 'DCTELEM *' but argument is of type 'DCTELEM (*)[32]' Signed-off-by: Mans Rullgard <mans@mansr.com>
| * svq3: replace unsafe pointer casting with intreadwrite macrosMans Rullgard2012-10-11
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'Michael Niedermayer2012-10-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '9734b8ba56d05e970c353dfd5baafa43fdb08024': Move avutil tables only used in libavcodec to libavcodec. Conflicts: libavcodec/mathtables.c libavutil/intmath.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move avutil tables only used in libavcodec to libavcodec.Diego Biurrun2012-10-11
| |
| * options_table: refs option is not snow-onlyDiego Biurrun2012-10-11
| |
* | truemotion2: remove unreachable codePaul B Mahol2012-10-12
| | | | | | | | | | | | Fixes CID610345. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | takdec: stop decoding in case of unknown bpsPaul B Mahol2012-10-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | takdec: s/bits_per_coded_sample/bits_per_raw_samplePaul B Mahol2012-10-12
| | | | | | | | | | | | | | | | | | | | bits_per_coded_sample should be set from demuxer and not from decoder. Prior to this change value set from demuxer would get overwritten in decoder. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | nellymoserenc: fix array element orderingMichael Niedermayer2012-10-12
| | | | | | | | | | | | | | | | Fixes assertion failures in trellis encoder Fixes valgrind warnings in trellis encoder Fixes CID732257 Fixes CID732256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tscc2: fix out of array accessMichael Niedermayer2012-10-12
| | | | | | | | | | Fixes CID732260 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>