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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-01avcodec/exr: use av_freep() for safteyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Makefile: fix out of tree builds of .m filesMichael Niedermayer
should fix fate failures on darwin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: fate: add SGI tests Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'Michael Niedermayer
* commit 'd613091f8858d87789916e2bd7a84ea3144077d4': sgi: decode 16bit RLE images Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'Michael Niedermayer
* commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38': sgi: encode images with 4 channels at 8 and 16 bits Conflicts: Changelog libavcodec/sgienc.c See: 21a100610977a163fe6480b5cf4c25f34f64b86b Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'Michael Niedermayer
* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f': sgi: decode images with 4 channels at 8 and 16 bits Conflicts: Changelog See: 0b1f20e23c3d61d06c86ee1aa160cd4da8b47b0c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'Michael Niedermayer
* commit 'ab7c64624a1254d509b71c2a4945336567e93845': sgi: remove redundant argument from read_uncompressed_sgi() Conflicts: libavcodec/sgidec.c See: 0f65693529decc470e3f01cb950b1864ea982c06 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'Michael Niedermayer
* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd': sgi: set the row boundary to the correct value Conflicts: libavcodec/sgidec.c See: 39c56ef9216c508a2c19cef93600e6590b4595cd Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit '0279d1d0946a854aa08919abd05b7f2da433823e'Michael Niedermayer
* commit '0279d1d0946a854aa08919abd05b7f2da433823e': sgi: fix end of line boundary detection See: 6fd7bf7b03c068d0f91de03bdd9b4e91695680eb Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'Michael Niedermayer
* commit 'e7cd53bf662a93330810981f1d057bdf2ead669e': sgi: check maximum supported resolution Conflicts: libavcodec/sgienc.c See: 59352cc219c4f933c9a83b45043ec4810c2a51ee Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'Michael Niedermayer
* commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f': sgi: K&R formatting cosmetics Conflicts: libavcodec/sgidec.c libavcodec/sgienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37'Michael Niedermayer
* commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37': codec_desc: set lossless attribute for SGI and DPX Conflicts: libavcodec/codec_desc.c See: 5b802cf567a0ee7a2990e08d08f8aa0abffbb7d2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit '06688e96fb9577bc7466a380bf7a14fa745208db'Michael Niedermayer
* commit '06688e96fb9577bc7466a380bf7a14fa745208db': fate: add exr tests Conflicts: tests/fate/image.mak See: 87888c043da9da407b3c601c47089163ff0e78d8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'Michael Niedermayer
* commit '38389058c3308758c6365abd0f6b45c5e62bb90b': OpenEXR decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/exr.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'Michael Niedermayer
* commit '678e455f1dc09265464b13d936d9fda62bc2bf43': dxva2: Directly use AVFrames Conflicts: libavcodec/dxva2_h264.c See: 29be9b5301212d29186a05f262a6ce04ddbc168c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01fate: add SGI testsVittorio Giovara
2014-04-01sgi: decode 16bit RLE imagesVittorio Giovara
2014-04-01sgi: encode images with 4 channels at 8 and 16 bitsVittorio Giovara
2014-04-01sgi: decode images with 4 channels at 8 and 16 bitsCarl Eugen Hoyos
2014-04-01sgi: remove redundant argument from read_uncompressed_sgi()Paul B Mahol
2014-04-01sgi: set the row boundary to the correct valueMichael Niedermayer
2014-04-01avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2Michael Niedermayer
Fixes Ticket3516 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01sgi: fix end of line boundary detectionMichael Niedermayer
2014-04-01sgi: check maximum supported resolutionPiotr Bandurski
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-01sgi: K&R formatting cosmeticsVittorio Giovara
2014-04-01codec_desc: set lossless attribute for SGI and DPXPaul B Mahol
2014-04-01fate: add exr testsPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-01OpenEXR decoderJimmy Christensen
Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno, Nicolas George, Paul B Mahol and Michael Niedermayer. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-01dxva2: Directly use AVFramesMichael Niedermayer
The assumption of (MPEG) Picture and H264Picture layout matching might not hold true in the future. Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
2014-04-01avformat/img2dec: zero probe bufferMichael Niedermayer
Fixes use of uninitialized memory Fixes valgrind failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01dshow: fixup some COM objects, based on patches from Don Moirrogerdpack
Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01lavd/qtkit: Fix non-constant initializer element for some clang compilers.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mov: Unbreak sbtl writing Conflicts: libavformat/movenc.c See: 8a9d0a1561470a185a3d09676fcf9b44830a4bfe Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'Michael Niedermayer
* commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80': vc1dec: improve hwaccel #ifdefs Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31Merge commit '33259118155764ce27a3433894659dda1d148b5f'Michael Niedermayer
* commit '33259118155764ce27a3433894659dda1d148b5f': h263: improve hwaccel #ifdefs Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31Merge commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081'Michael Niedermayer
* commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081': libx265: Use the repeat headers flag when not using global headers See: 1b28d9b357db2b6f8360e68c03247d3b81655b10 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31Merge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'Michael Niedermayer
* commit 'cd60631752cafe106b406f00966ac0323ad2ce1f': libx265: Bump version requirement See: 32998ee9577ab32d11c4704fde527df0e982092d Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31mov: Unbreak sbtl writingMichael Niedermayer
2014-03-31vc1dec: improve hwaccel #ifdefsRémi Denis-Courmont
2014-03-31h263: improve hwaccel #ifdefsRémi Denis-Courmont
2014-03-31avcodec/mjpegdec: support subsampled 420 CMYKMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31avcodec/mjpegdec: upgrade upscale_v to support multiple planesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31avcodec/mjpegdec: upgrade upscale_h to support multiple planesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31libx265: Use the repeat headers flag when not using global headersMarcus Gustafsson
This allows proper muxing and seeking in things like MPEG-TS, by placing headers by random access points. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-03-31libx265: Bump version requirementDerek Buitenhuis
Build 13 has a crucial fix which makes x265_encode_headers work as its always been documented. Previous to this, the check was incorrect. Also allows for use of the repeat headers flag. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-03-31libx265: Use the repeat headers flag when not using global headersMarcus Gustafsson
This allows proper muxing and seeking in things like MPEG-TS, by placing headers by random access points. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-03-31libx265: Bump version requirementDerek Buitenhuis
Build 13 has a crucial fix which makes x265_encode_headers work as its always been documented. Previous to this, the check was incorrect. Also allows for use of the repeat headers flag. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-03-31avcodec/adpcm: also squelch 'mismatch in coded sample count' warning for ↵Peter Ross
AV_CODEC_ID_ADPCM_EA_R1 AV_CODEC_ID_ADPCM_EA_R1/R2/R3 all use an internal offset. For some samples there is padding between the offset table and ADPCM data. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31configure: Remove invalid option --disable-qtkit.Thilo Borgmann
QTKit can/should be disabled by "--disable-indev=qtkit". Found by Justin Derrick. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31avfilter/vf_pullup: fix gray8Michael Niedermayer
Fixes segfault Fixes Ticket3469 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>