summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'Michael Niedermayer2014-07-01
|\ | | | | | | | | | | | | | | | | | | | | * 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-30
| | | | | | | | This obviates a dependency of the LJPEG encoder on mpegvideo.
* | avcodec/hevc: Use av_malloc(z)_array()Michael Niedermayer2014-07-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: remove unused variablesMichael Niedermayer2014-06-30
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Check input buffer size in parse_presentation_segment()Michael Niedermayer2014-06-30
| | | | | | | | | | | | Might fix overread, no testcase known though. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772'Michael Niedermayer2014-06-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-30
| | | | | | | | | | | | | | | | | | 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>
* | avcodec/pgssubdec: fix end display timeJohn Stebbins2014-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Bail out of decode_rle() if error and AV_EF_EXPLODE is setJohn Stebbins2014-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: better error codesJohn Stebbins2014-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: Pass AVSubtitleRect to decode_rle()John Stebbins2014-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: split out flush_cache()John Stebbins2014-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: do not fail when part of the packet is faulty unless ↵John Stebbins2014-06-30
| | | | | | | | | | | | AV_EF_EXPLODE is set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pgssubdec: rename PICTURE_SEGMENTJohn Stebbins2014-06-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/huffyuvencdsp: try to fix misaligned accessMichael Niedermayer2014-06-29
| | | | | | | | | | | | Should fix fate on MIPS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cavs: improve conformance with rm52j reference decoderYao Wang2014-06-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cavs: make cavs_chroma_qp non staticMichael Niedermayer2014-06-28
| | | | | | | | | | | | | | | | The table is needed by multiple files Reverts part of ef07ac1e126b95ad7e1b56504c19b59901265c3e Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: dont overwrite emu_edge bufferMichael Niedermayer2014-06-28
| | | | | | | | | | | | Fixes vsynth3 fate failures on mips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: reduce space between blocks in emu_edge in ↵Michael Niedermayer2014-06-28
| | | | | | | | encode_mb_internal
* | Revert "x86/videodsp: add emulated_edge_mc_mmxext"Michael Niedermayer2014-06-28
| | | | | | | | | | | | | | | | | | | | The commit causes minor out of array reads and was mainly intended for future optimizations which turned out not to be meassurably faster. Itself it was just 1 cpu cycle faster Approved-by: jamrial This reverts commit 057d2704e78b52fec357b4fc646c9de37a085413.
* | avcodec/mpeg12dec: Limit progressive_seq reinitilaization to where the ↵Michael Niedermayer2014-06-28
| | | | | | | | | | | | | | | | resolution changes Fixes Ticket3743 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vp8: Fix multiple ff_thread_finish_setup() callsMichael Niedermayer2014-06-27
| | | | | | | | | | | | Fixes Ticket3725 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | * commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28': mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: Change ff_convert_matrix() to take an MpegEncContext parameterDiego Biurrun2014-06-27
| | | | | | | | This will come in handy during dsputil splitting.
* | Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | * commit 'e63b818dbe6060b606ae10eb184859f8b97d2353': dv: Properly split decoder and encoder initialization Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Properly split decoder and encoder initializationDiego Biurrun2014-06-27
| |
* | avcodec/dvbsubdec: fix ignoring blank frame by updating got_outputAnshul Maheshwari2014-06-27
| | | | | | | | | | | | fix ticket 3737 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/snow: factor ff_snow_get_buffer() outMichael Niedermayer2014-06-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | * commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133': dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectoryDiego Biurrun2014-06-26
| |
* | Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | | | * commit '24f45c16224d4c5d482e928676714766ffdda4fc': fate: Add dependencies for dct/fft/mdct/rdft tests Conflicts: libavcodec/fft-test.c tests/fate/fft.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add dependencies for dct/fft/mdct/rdft testsDiego Biurrun2014-06-26
| |
* | Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | * commit '5ec6d152e26c570c0a16ec72c1f354db95708179': indeo4: B-frames decoding Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: B-frames decodingDirk Ausserhaus2014-06-26
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | * commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6': indeo2: rename stride to pitch for consistency with other Indeo decoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo2: rename stride to pitch for consistency with other Indeo decodersKostya Shishkov2014-06-26
| |
* | Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443': lavc: do not allocate edges in the default get_buffer2() Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: do not allocate edges in the default get_buffer2()Anton Khirnov2014-06-26
| |
| * hevc: remove unused array min_cb_addr_zsGildas Cocherel2014-06-26
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/snow: ensure the buffers have allocated edgesMichael Niedermayer2014-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9b60d9197970658e91daf4b586397f450de9af69'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9b60d9197970658e91daf4b586397f450de9af69': hevc: Allow out of bound values for num_reorder_pics Conflicts: libavcodec/hevc_ps.c See: bc21260e643c2249e38f7485bceada1d4bbb2b9a See: ab296c7a9fe590860dc95ba97e9cbb9dde798f20 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: Allow out of bound values for num_reorder_picsKieran Kunhya2014-06-26
| | | | | | | | | | | | This fixes decoding for a sample that cannot be shared Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | x86/videodsp: add emulated_edge_mc_mmxextJames Almer2014-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This also changes hfix8_mmx and above to use mmx regs instead of gprs, and makes emulated_edge_mc_sse and emulated_edge_mc_sse2 use mmxext hfix and hvar functions instead of mmx where possible. This is mostly in preparation for an ssse3 version. Signed-off-by: James Almer <jamrial@gmail.com> code is about 1 cpu cycle faster approximately Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cavs: fix B_SUB_DIRECT col-MB is Intra MB case.Yao Wang2014-06-26
| | | | | | | | | | | | | | | | | | in this case current MB size is forced to 16x16 (AVS standard section 9.9.1) Signed-off-by: Yao Wang <jiayaowang@gmail.com> Fixes Ticket 1901 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '593d2326ef985cdffe413df629419938f7b07c4c'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit '593d2326ef985cdffe413df629419938f7b07c4c': dv: Replace a magic number by sizeof() Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Replace a magic number by sizeof()Diego Biurrun2014-06-25
| |
* | Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | * commit '5ab03e41e553452118113d0c224fa32b325e45e5': x86: h264dsp: Fix link failure with optimizations disabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264dsp: Fix link failure with optimizations disabledDiego Biurrun2014-06-25
| | | | | | | | | | | | | | | | With optimzations disabled compilers have trouble doing dead code elimination on 'if (foo && 0)' expressions, while 'if (0 && foo)' still works, so use the latter to avoid problems. Bug-Id: 707
| * mjpegdec: Properly set the context colorspace infoDerek Buitenhuis2014-06-24
| | | | | | | | | | | | The JPEG spec requires it to be this. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avcodec/x86/hevc_idct: fix function name in commentMichael Niedermayer2014-06-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>