Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-06avcodec/Makefile: add libutvideo.h to SKIPHEADERSMichael Niedermayer
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>
2014-07-06avcodec/old_codec_ids: workaround doxygen inclusion bugTimothy Gu
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>
2014-07-05x86/svq1enc: port ssd_int8_vs_int16 to yasmJames Almer
Also add an SSE2 version Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-05Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'Michael Niedermayer
* commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b': x86: build: Only compile FDCT code if MMX is enabled Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-05Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'Michael Niedermayer
* 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>
2014-07-05Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'Michael Niedermayer
* 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>
2014-07-05x86: build: Only compile FDCT code if MMX is enabledDiego Biurrun
All other files containing purely inline assembly are treated the same way.
2014-07-05x86: Unconditionally compile blockdsp and svq1enc init filesDiego Biurrun
This avoids a link failure with MMX disabled as the init functions are referenced unconditionally.
2014-07-05x86: huffyuvdsp: Move inline assembly to init fileDiego Biurrun
This avoids a link failure with MMX disabled as now code and initialization are compiled under the same condition.
2014-07-05Fix standalone compilation of the amv encoder.Carl Eugen Hoyos
2014-07-05Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer
* 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>
2014-07-05Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'Michael Niedermayer
* commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b': libfdk-aacdec: Reduce the default decoder delay by one frame Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-05Use os/2 palette even if it contains less than 256 entries.Carl Eugen Hoyos
Fixes 11Bios13.bmp.
2014-07-05Assume that old bmps do not contain transparency information.Carl Eugen Hoyos
Fixes MK50TEMP.BMP that has its RGB channel bit masks on the actual image.
2014-07-05libfdk-aacdec: Reduce the default decoder delay by one frameOmer Osman
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>
2014-07-04avcodec/mlp_parser: check ff_combine_frame() return codeMichael Niedermayer
Fixes CID602338 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avcodec/bmp: fix integer overflow in checking header sizesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'Michael Niedermayer
* commit '391ecc961ced2bde7aecb3053ac35191f838fae8': x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase Conflicts: libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'Michael Niedermayer
* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced': webpdec: Fix decoding of the huffman group indices. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avcodec/dvdsubdec: fix alpha in debuging codeOliver Fromme
improve the debugging function for saving subtitles to PPM files: Actually use the alpha channel. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-04avcodec/dvdsubdec: Fix off-by-one errorOliver Fromme
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>
2014-07-04x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercaseDiego Biurrun
2014-07-03webpdec: Fix decoding of the huffman group indices.Justin Ruggles
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."
2014-07-03Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'Michael Niedermayer
* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5': hevc: Use the local context variable when needed Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03hevc: Use the local context variable when neededLuca Barbato
2014-07-02avcodec/on2avc: Fix out of array accessMichael Niedermayer
Fixes CID1206648 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02avcodec: Updated comment for sub paramAnshul Maheshwari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02avcodec/dvbsubdec: removed unnecessary null check for subtitleAnshul Maheshwari
In refrence to coverity defect 1224278 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02avcodec/dvdec: remove redundant null checkMichael Niedermayer
Fixes CID700682 again Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02avcodec/bitstream: remove trivial assertMichael Niedermayer
Fixed CID1224273 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02x86: rename dsputil.asm to idctdsp.asmJames Almer
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>
2014-07-02avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02avcodec/mjpegdec: handle luma upscale detection genericallyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of ↵Michael Niedermayer
hardcoding a list Some code is left to handle corner cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02avcodec/mjpegdec: Support pix_fmt_id==0x11222200Michael Niedermayer
Fixes: 4858286_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-02avcodec/mjpegdec: fix width for non chroma in rescalingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01mjpegdec: Support pix_fmt_id == 0x22112200Michael Niedermayer
Fixes 4780490_300.jpg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01vaapi: Update idct_permutation location after dsputil/idctdsp splitDiego Biurrun
2014-07-01Merge commit '79793f833784121d574454af4871866576c0749d'Michael Niedermayer
* commit '79793f833784121d574454af4871866576c0749d': Update Fiona's name in copyright statements. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'Michael Niedermayer
* 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>
2014-07-01Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'Michael Niedermayer
* 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>
2014-07-01Update Fiona's name in copyright statements.Diego Biurrun
2014-07-01avcodec/hevc: Use av_malloc(z)_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30avcodec/pgssubdec: remove unused variablesMichael Niedermayer
Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30avcodec/pgssubdec: Check input buffer size in parse_presentation_segment()Michael Niedermayer
Might fix overread, no testcase known though. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'Michael Niedermayer
* 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>
2014-06-30avcodec/pgssubdec: fix end display timeJohn Stebbins
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30avcodec/pgssubdec: Bail out of decode_rle() if error and AV_EF_EXPLODE is setJohn Stebbins
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30avcodec/pgssubdec: better error codesJohn Stebbins
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30avcodec/pgssubdec: Pass AVSubtitleRect to decode_rle()John Stebbins
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>