aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/mjpegenc_common: Restore removed copyright statementsMichael Niedermayer2014-07-061-0/+2
| | | | | | | | | These where removed by libav while spliting the file in adcb8392c9b185fd8a91a95fa256d15ab1432a30 See: de6d9b6404bfd1c589799142da5a95428f146edd See: 723106b279d9d78f5966f32bedfa33b88a702f69 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/Makefile: add libutvideo.h to SKIPHEADERSMichael Niedermayer2014-07-061-0/+1
| | | | | | | libutvideo.h is not a C header and thus fails building as a C file Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/old_codec_ids: workaround doxygen inclusion bugTimothy Gu2014-07-061-2/+0
| | | | | | | | | | | | | | | Currently, http://ffmpeg.org/doxygen/trunk/group__preproc__misc.html is broken, because of inclusion bug in Doxygen's preprocessing mode. The now-unincluded header file is included anyway in avcodec.h, the only place where it is used, so there should be no problem removing it. One concern is API-compatibility, because old_codec_ids.h is a public header. However, IMO this is not a problem because currently users cannot include only this header and not `avcodec.h` anyway, because of missing AV_CODEC_ID_NONE symbol. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* x86/svq1enc: port ssd_int8_vs_int16 to yasmJames Almer2014-07-056-78/+107
| | | | | | | Also add an SSE2 version Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'Michael Niedermayer2014-07-051-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b': x86: build: Only compile FDCT code if MMX is enabled Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: build: Only compile FDCT code if MMX is enabledDiego Biurrun2014-07-051-1/+1
| | | | | | | | All other files containing purely inline assembly are treated the same way.
* | Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'Michael Niedermayer2014-07-053-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc': x86: Unconditionally compile blockdsp and svq1enc init files Conflicts: libavcodec/x86/Makefile blockdsp_mmx is renamed to blockdsp_init as we already have a blockdsp file and _init is how all other such files are called Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Unconditionally compile blockdsp and svq1enc init filesDiego Biurrun2014-07-053-2/+2
| | | | | | | | | | This avoids a link failure with MMX disabled as the init functions are referenced unconditionally.
* | Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'Michael Niedermayer2014-07-054-94/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '009331303a6462d07cbe94aef9c446f1a1695519': x86: huffyuvdsp: Move inline assembly to init file Conflicts: libavcodec/x86/Makefile libavcodec/x86/huffyuvdsp.h libavcodec/x86/huffyuvdsp_init.c libavcodec/x86/huffyuvdsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: huffyuvdsp: Move inline assembly to init fileDiego Biurrun2014-07-054-131/+76
| | | | | | | | | | This avoids a link failure with MMX disabled as now code and initialization are compiled under the same condition.
* | Fix standalone compilation of the amv encoder.Carl Eugen Hoyos2014-07-051-1/+1
| |
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-07-051-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Use os/2 palette even if it contains less than 256 entries. Assume that old bmps do not contain transparency information. Do not detect jp2 images as mov files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Use os/2 palette even if it contains less than 256 entries.Carl Eugen Hoyos2014-07-051-0/+2
| | | | | | | | | | | | Fixes 11Bios13.bmp.
| * | Assume that old bmps do not contain transparency information.Carl Eugen Hoyos2014-07-051-0/+1
| | | | | | | | | | | | Fixes MK50TEMP.BMP that has its RGB channel bit masks on the actual image.
* | | Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'Michael Niedermayer2014-07-052-10/+6
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | * commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b': libfdk-aacdec: Reduce the default decoder delay by one frame Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libfdk-aacdec: Reduce the default decoder delay by one frameOmer Osman2014-07-052-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The default error concealment method if none is set via aacDecoder_SetParam(AAC_CONCEAL_METHOD) is set in CConcealment_InitCommonData within the fdk-aac library and is set to Energy Interpolation. This method requires one frame delay to the output. To reduce the default decoder output delay and avoid missing the last frame in file based decoding, use Noise Substitution as the default concealment method. Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/mlp_parser: check ff_combine_frame() return codeMichael Niedermayer2014-07-041-1/+5
| | | | | | | | | | | | Fixes CID602338 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/bmp: fix integer overflow in checking header sizesMichael Niedermayer2014-07-041-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'Michael Niedermayer2014-07-042-16/+16
|\| | | | | | | | | | | | | | | | | | | * commit '391ecc961ced2bde7aecb3053ac35191f838fae8': x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase Conflicts: libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercaseDiego Biurrun2014-07-032-16/+16
| |
* | Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'Michael Niedermayer2014-07-041-2/+6
|\| | | | | | | | | | | | | * commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced': webpdec: Fix decoding of the huffman group indices. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * webpdec: Fix decoding of the huffman group indices.Justin Ruggles2014-07-031-2/+6
| | | | | | | | | | | | Per the specification, "The red and green components of a pixel define the meta Huffman code used in a particular block of the ARGB image."
* | avcodec/dvdsubdec: fix alpha in debuging codeOliver Fromme2014-07-041-5/+9
| | | | | | | | | | | | | | improve the debugging function for saving subtitles to PPM files: Actually use the alpha channel. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvdsubdec: Fix off-by-one errorOliver Fromme2014-07-041-1/+1
| | | | | | | | | | | | | | | | Fix an off-by-one error that causes the height of decoded subtitles to be too small, thus cutting off the lowest row of pixels. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'Michael Niedermayer2014-07-031-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'df949b645b12d62bb4da56d629a887c81f67f2e5': hevc: Use the local context variable when needed Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: Use the local context variable when neededLuca Barbato2014-07-021-1/+1
| |
| * vaapi: Update idct_permutation location after dsputil/idctdsp splitDiego Biurrun2014-07-012-2/+2
| |
* | avcodec/on2avc: Fix out of array accessMichael Niedermayer2014-07-021-1/+1
| | | | | | | | | | | | Fixes CID1206648 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: Updated comment for sub paramAnshul Maheshwari2014-07-021-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvbsubdec: removed unnecessary null check for subtitleAnshul Maheshwari2014-07-021-1/+1
| | | | | | | | | | | | In refrence to coverity defect 1224278 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvdec: remove redundant null checkMichael Niedermayer2014-07-021-1/+1
| | | | | | | | | | | | Fixes CID700682 again Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/bitstream: remove trivial assertMichael Niedermayer2014-07-021-1/+0
| | | | | | | | | | | | Fixed CID1224273 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: rename dsputil.asm to idctdsp.asmJames Almer2014-07-022-2/+2
| | | | | | | | | | | | | | Its only function is no longer part of dsputil. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch()Michael Niedermayer2014-07-011-12/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: handle luma upscale detection genericallyMichael Niedermayer2014-07-011-2/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of ↵Michael Niedermayer2014-07-011-8/+11
| | | | | | | | | | | | | | | | hardcoding a list Some code is left to handle corner cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Support pix_fmt_id==0x11222200Michael Niedermayer2014-07-011-2/+11
| | | | | | | | | | | | Fixes: 4858286_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: fix width for non chroma in rescalingMichael Niedermayer2014-07-011-4/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: Support pix_fmt_id == 0x22112200Michael Niedermayer2014-07-011-2/+3
| | | | | | | | | | | | Fixes 4780490_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '79793f833784121d574454af4871866576c0749d'Michael Niedermayer2014-07-0113-13/+13
|\| | | | | | | | | | | | | * commit '79793f833784121d574454af4871866576c0749d': Update Fiona's name in copyright statements. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Update Fiona's name in copyright statements.Diego Biurrun2014-07-0111-11/+11
| |
* | Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer2014-07-0180-973/+1307
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e3fcb14347466095839c2a3c47ebecff02da891e': dsputil: Split off IDCT bits into their own context Conflicts: configure libavcodec/aic.c libavcodec/arm/Makefile libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/asvdec.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dvdec.c libavcodec/dxva2_mpeg2.c libavcodec/intrax8.c libavcodec/mdec.c libavcodec/mjpegdec.c libavcodec/mjpegenc_common.h libavcodec/mpegvideo.c libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/idctdsp.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off IDCT bits into their own contextDiego Biurrun2014-06-3076-874/+1214
| |
* | Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'Michael Niedermayer2014-07-017-361/+429
|\| | | | | | | | | | | | | | | | | | | | | * commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30': mjpeg: Split off bits shared by MJPEG and LJPEG encoders Conflicts: libavcodec/mjpegenc.c libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Split off bits shared by MJPEG and LJPEG encodersDiego Biurrun2014-06-307-294/+360
| | | | | | | | This obviates a dependency of the LJPEG encoder on mpegvideo.
* | avcodec/hevc: Use av_malloc(z)_array()Michael Niedermayer2014-07-011-11/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: remove unused variablesMichael Niedermayer2014-06-301-3/+0
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Check input buffer size in parse_presentation_segment()Michael Niedermayer2014-06-301-0/+8
| | | | | | | | | | | | Might fix overread, no testcase known though. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'Michael Niedermayer2014-06-301-120/+239
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772': pgssubdec: handle more complex PGS scenarios Conflicts: libavcodec/pgssubdec.c Some of this has been split out and commited in cleanly split patches immedeately before this merge Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pgssubdec: handle more complex PGS scenariosJohn Stebbins2014-06-301-130/+294
| | | | | | | | | | | | | | | | | | Add ability to handle multiple palettes and objects simultaneously. Each simultaneous object is given its own AVSubtitleRect. Note that there can be up to 64 currently valid objects, but only 2 at any one time can be "presented". Signed-off-by: Anton Khirnov <anton@khirnov.net>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:43:03 +0000