summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* swscale: add full bgra64 supportMichael Niedermayer2014-04-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avidec: remove unused variablesMichael Niedermayer2014-04-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-02
|\ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vf_settb: rename to settb Conflicts: libavfilter/Makefile libavfilter/f_settb.c libavfilter/settb.c libavfilter/vf_settb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_settb: rename to settbKaterina Barone-Adesi2014-04-02
| | | | | | | | | | | | An audio version of settb (asettb) will be added to this file. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e': avi: Improve non-interleaved detection Conflicts: libavformat/avidec.c See: 8df774be88c347c40f1b2411ed9e391dfec0ebb7 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avi: Improve non-interleaved detectionMichael Niedermayer2014-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional fixes by Nigel Touati-Evans <nigel.touatievans@gmail.com>. Check the index for streams with a time drift of 2s or a buffer drift of 64MB. Bug-Id: 666 CC: libav-stable@libav.org Sample-Id: yet-another-broken-interleaved-avi.avi Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '0ca0924c10d9617a5793964bf79655424ef32b68': swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64 Conflicts: libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64Janne Grunau2014-04-02
| |
* | Changelog: remove unecessary "added"Clément Bœsch2014-04-02
| |
* | avcodec/ac3dec: use av_freep() for safteyMichael Niedermayer2014-04-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: vc1dec: fix a possible unitialized variable warning Conflicts: libavcodec/vc1dec.c No change as the variables where not uninitialized in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: fix a possible unitialized variable warningVittorio Giovara2014-04-02
| |
* | Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | * commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509': lavf: add supported extension to avi and mov demuxers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add supported extension to avi and mov demuxersMarc-Antoine Arnaud2014-04-02
| |
* | Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * More correct printf format specifiersDiego Biurrun2014-04-02
| | | | | | | | This avoids compiler warnings about argument and specifier type mismatch.
* | Merge commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e': lavu: add missing formats to av_pix_fmt_swap_endianness Conflicts: libavutil/pixdesc.c No change as our av_pix_fmt_swap_endianness() does not need formats to be listed individually Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add missing formats to av_pix_fmt_swap_endiannessJanne Grunau2014-04-02
| |
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-04-02
|\ \ | | | | | | | | | | | | | | | | | | | | | * cus/stable: mpeg12enc: always set closed gop flag on the first gop mpeg12enc: always write closed gops for intra only outputs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpeg12enc: always set closed gop flag on the first gopMarton Balint2014-04-01
| | | | | | | | | | | | | | | | | | | | | | | | Improves compatibility with XDCAM HD formats. It has been set for a long time in ffmbc. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
| * | mpeg12enc: always write closed gops for intra only outputsMarton Balint2014-04-01
| | | | | | | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-02
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * qatar/master: VP3: K&R formatting cosmetics Conflicts: libavcodec/vp3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | VP3: K&R formatting cosmeticsVittorio Giovara2014-04-01
| | |
* | | Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'Michael Niedermayer2014-04-01
|\| | | |/ |/| | | | | | | | | | | | | | | * commit '66d04c068a30751750818dcfbb6555ab74eb3f6d': fate: Explicitly use gray16le in fate-sgi-gray16 Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Explicitly use gray16le in fate-sgi-gray16Martin Storsjö2014-04-01
| | | | | | | | | | | | This fixes the test on big endian. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/ac3dec_fixed: add missingAVprefix to CODEC_IDMichael Niedermayer2014-04-01
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nedeljko Babic <nbabic@mips.com>
* | avcodec/ac3dec: avoid #if, use if() instead, its cleaner and shorterMichael Niedermayer2014-04-01
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nedeljko Babic <nbabic@mips.com>
* | avcodec/ac3: rename identifier used to select the fixed point variantMichael Niedermayer2014-04-01
| | | | | | | | | | | | | | | | the CONFIG_ prefix is used by configure, using it for other things is potentially confusing to the reader Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nedeljko Babic <nbabic@mips.com>
* | libavcodec: Implementation of AC3 fixedpoint decoderNedeljko Babic2014-04-01
| | | | | | | | | | Signed-off-by: Nedeljko Babic <nbabic@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/fixed_dsp: remove redundant castMichael Niedermayer2014-04-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavutil: Add fixed_dspNedeljko Babic2014-04-01
| | | | | | | | | | Signed-off-by: Nedeljko Babic <nbabic@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeglsdec: add PAL8 supportMichael Niedermayer2014-04-01
| | | | | | | | | | | | Fixes Ticket3478 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/exr: use av_freep() for safteyMichael Niedermayer2014-04-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Makefile: fix out of tree builds of .m filesMichael Niedermayer2014-04-01
| | | | | | | | | | | | should fix fate failures on darwin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-04-01
|\| | | | | | | | | | | | | * qatar/master: fate: add SGI tests Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: add SGI testsVittorio Giovara2014-04-01
| |
* | Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'Michael Niedermayer2014-04-01
|\| | | | | | | | | | | | | | | | | | | * commit 'd613091f8858d87789916e2bd7a84ea3144077d4': sgi: decode 16bit RLE images Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sgi: decode 16bit RLE imagesVittorio Giovara2014-04-01
| |
* | Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'Michael Niedermayer2014-04-01
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * sgi: encode images with 4 channels at 8 and 16 bitsVittorio Giovara2014-04-01
| |
* | Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'Michael Niedermayer2014-04-01
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f8dea10d3f09376894613d0266c34d1a16ac735f': sgi: decode images with 4 channels at 8 and 16 bits Conflicts: Changelog See: 0b1f20e23c3d61d06c86ee1aa160cd4da8b47b0c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sgi: decode images with 4 channels at 8 and 16 bitsCarl Eugen Hoyos2014-04-01
| |
* | Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'Michael Niedermayer2014-04-01
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ab7c64624a1254d509b71c2a4945336567e93845': sgi: remove redundant argument from read_uncompressed_sgi() Conflicts: libavcodec/sgidec.c See: 0f65693529decc470e3f01cb950b1864ea982c06 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sgi: remove redundant argument from read_uncompressed_sgi()Paul B Mahol2014-04-01
| |
* | Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'Michael Niedermayer2014-04-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '6d9ccee4519f41155c88655c77bfb1ef085797fd': sgi: set the row boundary to the correct value Conflicts: libavcodec/sgidec.c See: 39c56ef9216c508a2c19cef93600e6590b4595cd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sgi: set the row boundary to the correct valueMichael Niedermayer2014-04-01
| |
* | Merge commit '0279d1d0946a854aa08919abd05b7f2da433823e'Michael Niedermayer2014-04-01
|\| | | | | | | | | | | | | | | * commit '0279d1d0946a854aa08919abd05b7f2da433823e': sgi: fix end of line boundary detection See: 6fd7bf7b03c068d0f91de03bdd9b4e91695680eb Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sgi: fix end of line boundary detectionMichael Niedermayer2014-04-01
| |
* | Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'Michael Niedermayer2014-04-01
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e7cd53bf662a93330810981f1d057bdf2ead669e': sgi: check maximum supported resolution Conflicts: libavcodec/sgienc.c See: 59352cc219c4f933c9a83b45043ec4810c2a51ee Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sgi: check maximum supported resolutionPiotr Bandurski2014-04-01
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>