summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'Michael Niedermayer2014-07-072-2/+2
|\ | | | | | | | | | | | | | | | | | | * commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d': libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <[email protected]>
| * libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstreamOmer Osman2014-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | For implicit signaling cases (as possible for Spectral Band Replication and Parametric Stereo Tools), the decoder must decode the first frame to correctly identify the stream configuration (as called from avformat_find_stream_info). The mechanism for this is built-in and only requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec struct. Signed-off-by: Omer Osman <[email protected]> Signed-off-by: Martin Storsjö <[email protected]>
* | avcodec/vmdvideo: remove unneeded includeMichael Niedermayer2014-07-071-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'Michael Niedermayer2014-07-073-217/+240
|\| | | | | | | | | | | | | | | | | | | * commit '246f869590b8c7313d26e1c2ef56db01f6fd2503': vmd: Split audio and video decoder Conflicts: libavcodec/vmdvideo.c Merged-by: Michael Niedermayer <[email protected]>
| * vmd: Split audio and video decoderNidhi Makhijani2014-07-073-219/+238
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | avcodec/cljrdec: remove unneeded includeMichael Niedermayer2014-07-071-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'Michael Niedermayer2014-07-0716-240/+206
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b': dsputil: Move draw_edges() to mpegvideoencdsp Conflicts: libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_x86.h Merged-by: Michael Niedermayer <[email protected]>
| * dsputil: Move draw_edges() to mpegvideoencdspDiego Biurrun2014-07-0612-195/+155
| |
* | Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'Michael Niedermayer2014-07-0721-347/+498
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d': dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/x86/dsputilenc.asm libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <[email protected]>
| * dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoencDiego Biurrun2014-07-0621-296/+444
| |
* | Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'Michael Niedermayer2014-07-0711-126/+247
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94': dsputil: Split off *_8x8basis to a separate context Conflicts: libavcodec/dsputil.c libavcodec/mpegvideo_enc.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <[email protected]>
| * dsputil: Split off *_8x8basis to a separate contextDiego Biurrun2014-07-0611-125/+245
| |
* | avcodec/mpegvideo_enc: fix b frame strategy 2Michael Niedermayer2014-07-071-6/+8
| | | | | | | | | | | | Fixes Ticket3757 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mpegvideo: small indent fix in vismv codeClément Bœsch2014-07-071-2/+2
| |
* | avcodec: make vismv option as flag typesClément Bœsch2014-07-071-1/+1
| | | | | | | | This allows for example -vismv pf+bf+bb instead of -vismv 7.
* | avcodec/roqvideodec: set JPEG output color rangeEric Lasota2014-07-071-0/+1
| | | | | | | | | | Signed-off-by: Eric Lasota <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'Michael Niedermayer2014-07-073-108/+137
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192': dsicin: Split audio and video decoder Conflicts: libavcodec/Makefile libavcodec/dsicinvideo.c Merged-by: Michael Niedermayer <[email protected]>
| * dsicin: Split audio and video decoderNidhi Makhijani2014-07-063-111/+139
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'Michael Niedermayer2014-07-063-67/+94
|\| | | | | | | | | | | | | | | | | | | * commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58': bmv: Split audio and video decoder Conflicts: libavcodec/bmvvideo.c Merged-by: Michael Niedermayer <[email protected]>
| * bmv: Split audio and video decoderNidhi Makhijani2014-07-063-69/+96
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | avcodec/roqvideo: use JPEG color rangeEric Lasota2014-07-062-2/+2
| | | | | | | | | | | | | | Signed-off-by: ejlasota <[email protected]> Also update fate test checksums Signed-off-by: Michael Niedermayer <[email protected]>
* | x86/svq1enc: use unaligned mov on SSE2James Almer2014-07-061-1/+1
| | | | | | | | | | | | | | Might fix fate failures on some systems Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'Michael Niedermayer2014-07-063-64/+88
|\| | | | | | | | | | | | | | | | | | | * commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3': paf: split audio and video decoder Conflicts: libavcodec/pafvideo.c Merged-by: Michael Niedermayer <[email protected]>
| * paf: split audio and video decoderNidhi Makhijani2014-07-063-67/+87
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit '373a6dda5422186bc057297342a9e559a564595e'Michael Niedermayer2014-07-063-74/+102
|\| | | | | | | | | | | | | | | | | | | | | * commit '373a6dda5422186bc057297342a9e559a564595e': cljr: split decoder and encoder Conflicts: libavcodec/Makefile libavcodec/cljrdec.c Merged-by: Michael Niedermayer <[email protected]>
| * cljr: split decoder and encoderNidhi Makhijani2014-07-063-75/+101
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | x86/svq1enc: port ssd_int8_vs_int16 to yasmJames Almer2014-07-056-78/+107
| | | | | | | | | | | | | | Also add an SSE2 version Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
| * 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 <[email protected]>
| * 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 <[email protected]>
| * 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 <[email protected]>
| * | 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 <[email protected]>
| * 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 <[email protected]> Signed-off-by: Martin Storsjö <[email protected]>
* | avcodec/mlp_parser: check ff_combine_frame() return codeMichael Niedermayer2014-07-041-1/+5
| | | | | | | | | | | | Fixes CID602338 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/bmp: fix integer overflow in checking header sizesMichael Niedermayer2014-07-041-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
| * 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 <[email protected]>
| * 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 <[email protected]>
* | 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 <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-22 23:59:28 +0000