summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/wmalosslessdec: Pass on error code from decode_tilehdr()Michael Niedermayer2014-01-111-2/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-01-111-2/+2
|\ | | | | | | | | | | | | * cehoyos/master: Cast signed libopenjpeg data values to unsigned before shifting. Merged-by: Michael Niedermayer <[email protected]>
| * Cast signed libopenjpeg data values to unsigned before shifting.Carl Eugen Hoyos2014-01-111-2/+2
| | | | | | | | | | | | This avoids undefined behaviour on left-shift. Reviewed-by: Michael Bradshaw
* | vdpau: restore compatibility with deprecated fields in AVVDPAUContextHendrik Leppkes2014-01-102-0/+34
|/ | | | | | | | Fixes ticket #3133. Signed-off-by: Hendrik Leppkes <[email protected]> Tested-by: EricV Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/matroskadec: check generic audio deinterleaver sub_packet_size ↵Michael Niedermayer2014-01-101-1/+1
| | | | | | | | | against frame_size Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f67d052a530_7517_nosound.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-100-0/+0
|\ | | | | | | | | | | | | | | * qatar/master: fate: Explicitly specify the rgb555le pixel format for the mss2 rgb555 tests See: 34e90b2e6d66c511bea872bcb3a0e34b482b8c17 Merged-by: Michael Niedermayer <[email protected]>
| * fate: Explicitly specify the rgb555le pixel format for the mss2 rgb555 testsMartin Storsjö2014-01-101-2/+2
| | | | | | | | | | | | This fixes these fate tests on big endian. Signed-off-by: Martin Storsjö <[email protected]>
* | avformat/flvdec: initialize context before reading from itMichael Niedermayer2014-01-101-1/+1
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f9b8387069e_5377_flv_with_pcm_s16be_audio_track.flv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | nut: Support XYZ12 rawvideoMichael Niedermayer2014-01-1013-20/+27
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | swscale: fix rgb48Toxyz12() endiannessMichael Niedermayer2014-01-1010-10/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mss2: fix chroma dimensionsMichael Niedermayer2014-01-102-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/avisynth simplify packet allocationMichael Niedermayer2014-01-101-24/+14
| | | | | | | | | | Reviewed-by: Stephen Hutchinson <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Fix libopenjpeg colour range adjust for 8<bpp<16.Carl Eugen Hoyos2014-01-101-2/+2
| | | | | | | | | | | | Fixes ticket #3284. Reviewed-by: Michael Bradshaw
* | Support signed j2k images via libopenjpeg.Carl Eugen Hoyos2014-01-101-4/+4
| | | | | | | | | | | | Fixes ticket #3283. Reviewed-by: Michael Bradshaw
* | Unscaled 16bit packed RGB to planar GBR converter.Carl Eugen Hoyos2014-01-101-0/+198
| | | | | | | | | | Fixes r210(rgb48) -> ffv1 (gbrp10) -> r210 roundtrip as reported by forum user JasonCA.
* | fate: fix MSS2 tests on big endianMichael Niedermayer2014-01-101-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-101-2/+1
|\| | | | | | | | | | | | | * qatar/master: avutil: do not use avcodec header in frame.h Merged-by: Michael Niedermayer <[email protected]>
| * avutil: do not use avcodec header in frame.hVittorio Giovara2014-01-091-2/+1
| |
* | Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'Michael Niedermayer2014-01-101-5/+17
|\| | | | | | | | | | | | | | | | | | | * commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24': avfilter: fix leaks on error in ff_filter_frame Conflicts: libavfilter/avfilter.c Merged-by: Michael Niedermayer <[email protected]>
| * avfilter: fix leaks on error in ff_filter_frameVittorio Giovara2014-01-091-6/+19
| |
* | Merge commit '5655732c77f2df9c1dfbddc30cd4844390a6921f'Michael Niedermayer2014-01-101-0/+8
|\| | | | | | | | | | | | | * commit '5655732c77f2df9c1dfbddc30cd4844390a6921f': avfilter: add needs_writable field to the internal AVFilterPad structure Merged-by: Michael Niedermayer <[email protected]>
| * avfilter: add needs_writable field to the internal AVFilterPad structureVittorio Giovara2014-01-091-0/+8
| |
* | Merge commit 'd44bd7fb27d4121512eae0ffce5e48bac25e82dc'Michael Niedermayer2014-01-101-0/+6
|\| | | | | | | | | | | | | * commit 'd44bd7fb27d4121512eae0ffce5e48bac25e82dc': avfilter: add documentation for needs_writable Merged-by: Michael Niedermayer <[email protected]>
| * avfilter: add documentation for needs_writableVittorio Giovara2014-01-091-0/+6
| |
* | Merge commit '11d704dc94c029058ac366f85951f6728638fb9c'Michael Niedermayer2014-01-106-0/+88
|\| | | | | | | | | | | | | * commit '11d704dc94c029058ac366f85951f6728638fb9c': fate: add framepack filter test Merged-by: Michael Niedermayer <[email protected]>
| * fate: add framepack filter testVittorio Giovara2014-01-096-0/+88
| |
* | Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'Michael Niedermayer2014-01-106-2/+413
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7d0e7ead95e584c4866617f046b2493066975c6': lavfi: add framepack filter Conflicts: Changelog doc/filters.texi libavfilter/allfilters.c libavfilter/version.h Merged-by: Michael Niedermayer <[email protected]>
| * lavfi: add framepack filterVittorio Giovara2014-01-096-1/+412
| |
* | Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'Michael Niedermayer2014-01-102-1/+29
|\| | | | | | | | | | | | | | | | | | | * commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558': flac muxer: add option to disable writing the global header Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <[email protected]>
| * flac muxer: add option to disable writing the global headerJustin Ruggles2014-01-092-1/+29
| | | | | | | | | | The global header is not explicitly required for playback, and omitting it allows for simple concatenation.
* | avformat/mxfdec: check avio_read(UID) resultMichael Niedermayer2014-01-101-1/+4
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fc9ba2fd98e_82_02785736.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/nutdec: fix packet end clearingMichael Niedermayer2014-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | The code was buggy, using the wrong variable, also it missed the case where the packet become smaller due to sidedata/metadata being extracted which left a few bytes uninitialized Fixes use of uninitialized memory Fixed: msan_uninit-mem_7f6abbe44530_6838_mewmew_vorbis_ssa.nut Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/rmdec: when reading audio blocks, dont leave holes when reading failsMichael Niedermayer2014-01-092-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | The fate test is changed because the reference file depends on the use of non cleared data at the very end. Alternatively we could upload a new reference file, though that would then have to be changed every time the handling of a truncated frame changes or theres a change to error concealment, each time adding a new file ... Fixes use of uninitialized memory Fixed: msan_uninit-mem_7f3c02b81363_2787_RLG2_19.rm Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mjpegdec: allow lowres with amvMichael Niedermayer2014-01-092-5/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mjpegdec: use the AVFrame width/height for flippingMichael Niedermayer2014-01-091-2/+2
| | | | | | | | | | | | This makes it possible to use the code with lowres Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mjpegdec: remove new flipping codeMichael Niedermayer2014-01-091-10/+1
| | | | | | | | | | | | | | | | | | | | | | It stored images wrong in the user provided buffers (that is you would end up with a wrongly flipped image if you used direct rendering). Also it used wrong dimensions as noticed by ubitux Enable the old code unconditionally so flipping works correctly again. Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-095-2/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ATRAC3+ decoder Conflicts: Changelog configure libavcodec/atrac3plus.c libavcodec/atrac3plus.h libavcodec/atrac3plus_data.h libavcodec/atrac3plusdec.c libavcodec/atrac3plusdsp.c libavcodec/version.h See: 2e1fb96af36348479e14aa85f445915ea09e70fa Merged-by: Michael Niedermayer <[email protected]>
| * ATRAC3+ decoderMaxim Polijakowski2014-01-0912-3/+5007
| | | | | | | | | | | | Cleanup by Diego Biurrun. Signed-off-by: Kostya Shishkov <[email protected]>
* | Merge commit '4c642d8d98703faf52983243098f35865e15b312'Michael Niedermayer2014-01-091-1/+2
|\| | | | | | | | | | | | | * commit '4c642d8d98703faf52983243098f35865e15b312': x86: hpeldsp: Add missing av_cold attribute to init function Merged-by: Michael Niedermayer <[email protected]>
| * x86: hpeldsp: Add missing av_cold attribute to init functionDiego Biurrun2014-01-091-1/+2
| |
* | Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b'Michael Niedermayer2014-01-096-0/+6
|\| | | | | | | | | | | | | * commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b': x86: avcodec: Add a bunch of missing #includes for av_cold Merged-by: Michael Niedermayer <[email protected]>
| * x86: avcodec: Add a bunch of missing #includes for av_coldDiego Biurrun2014-01-096-0/+6
| |
* | Merge commit '4b48201d4d9d57a2a1ecf8504bc928aff83cb99a'Michael Niedermayer2014-01-091-1/+3
|\| | | | | | | | | | | | | * commit '4b48201d4d9d57a2a1ecf8504bc928aff83cb99a': ac3tab.h: #include the correct headers Merged-by: Michael Niedermayer <[email protected]>
| * ac3tab.h: #include the correct headersDiego Biurrun2014-01-091-1/+3
| |
* | doc/examples/muxing: Fixes frame initialization.Andre Anjos2014-01-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes use of the example with encoders which use tha AVFrame w/h/pix_fmt fields FFV1 is one of these codecs We cannot easily workaround the not set fields in common code because the API has AVFrame constant for the encoders. Alternatives would be to fix the API or to duplicate the struct and fill in missing fields. Or as is to require all user apps to set this correctly and maybe simplify for that case Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-092-9/+22
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: mjpegdec: apply flipping after decoding, not before Conflicts: libavcodec/mjpegdec.c libavcodec/mjpegdec.h Merged-by: Michael Niedermayer <[email protected]>
| * mjpegdec: apply flipping after decoding, not beforeAnton Khirnov2014-01-092-15/+20
| | | | | | | | This is simpler and removes a silly restriction on edges being present.
* | Merge commit 'e588615d938f8581f0d6f3771662d08cadfc00de'Michael Niedermayer2014-01-092-19/+22
|\| | | | | | | | | | | | | | | | | | | * commit 'e588615d938f8581f0d6f3771662d08cadfc00de': hevc: fix decoding of one PU wide files Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <[email protected]>
| * hevc: fix decoding of one PU wide filesGuillaume Martres2014-01-092-17/+22
| | | | | | | | | | | | | | For those the block size may be larger than the source linesize (if the edges are not allocated). Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit 'a246af86e47044dec243db2f708cc125d608ea78'Michael Niedermayer2014-01-096-0/+131
|\| | | | | | | | | | | | | * commit 'a246af86e47044dec243db2f708cc125d608ea78': FATE: add MSS2 tests Merged-by: Michael Niedermayer <[email protected]>