Michael Niedermayer
cc8b45c0ce
avformat/avidec: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 19:04:58 +02:00
Michael Niedermayer
0652ffc69a
Merge remote-tracking branch 'qatar/master'
...
* 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>
2014-04-02 18:25:15 +02:00
Michael Niedermayer
91a0d3af65
Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'
...
* commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e':
avi: Improve non-interleaved detection
Conflicts:
libavformat/avidec.c
See: 8df774be88
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 18:03:02 +02:00
Michael Niedermayer
3428a9b8d5
Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'
...
* 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>
2014-04-02 17:46:19 +02:00
Katerina Barone-Adesi
b33c64e4c2
vf_settb: rename to settb
...
An audio version of settb (asettb) will be added to this file.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-02 12:14:10 +02:00
Michael Niedermayer
9d599e3f6e
avi: Improve non-interleaved detection
...
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>
2014-04-02 12:11:31 +02:00
Janne Grunau
0ca0924c10
swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64
2014-04-02 11:39:26 +02:00
Clément Bœsch
cecb6d6f83
Changelog: remove unecessary "added"
2014-04-02 07:45:06 +02:00
Michael Niedermayer
c00f368caa
avcodec/ac3dec: use av_freep() for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 04:38:16 +02:00
Michael Niedermayer
27f77a372b
Merge remote-tracking branch 'qatar/master'
...
* 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>
2014-04-02 03:25:29 +02:00
Michael Niedermayer
61b3b3315c
Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'
...
* commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509':
lavf: add supported extension to avi and mov demuxers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 03:15:19 +02:00
Michael Niedermayer
45ba9d8545
Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'
...
* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e':
More correct printf format specifiers
Conflicts:
libavcodec/h264_ps.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 02:54:09 +02:00
Michael Niedermayer
119cf2a44b
Merge commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e'
...
* 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>
2014-04-02 02:44:00 +02:00
Michael Niedermayer
e03f093318
Merge remote-tracking branch 'cus/stable'
...
* 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>
2014-04-02 00:32:34 +02:00
Vittorio Giovara
c611148340
vc1dec: fix a possible unitialized variable warning
2014-04-02 00:28:05 +02:00
Marc-Antoine Arnaud
f1c4a54f6e
lavf: add supported extension to avi and mov demuxers
2014-04-02 00:27:53 +02:00
Diego Biurrun
cba4e6062a
More correct printf format specifiers
...
This avoids compiler warnings about argument and specifier type mismatch.
2014-04-02 00:27:22 +02:00
Janne Grunau
80035db88c
lavu: add missing formats to av_pix_fmt_swap_endianness
2014-04-02 00:27:22 +02:00
Michael Niedermayer
d063bb63cb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
VP3: K&R formatting cosmetics
Conflicts:
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 00:25:21 +02:00
Vittorio Giovara
d2264740e6
VP3: K&R formatting cosmetics
2014-04-01 23:47:25 +02:00
Michael Niedermayer
909757fabd
Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'
...
* commit '66d04c068a30751750818dcfbb6555ab74eb3f6d':
fate: Explicitly use gray16le in fate-sgi-gray16
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 21:00:26 +02:00
Marton Balint
a0cf87780d
mpeg12enc: always set closed gop flag on the first gop
...
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>
2014-04-01 20:52:37 +02:00
Marton Balint
51c61e64cb
mpeg12enc: always write closed gops for intra only outputs
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-04-01 20:52:09 +02:00
Michael Niedermayer
3b37f22861
avcodec/ac3dec_fixed: add missingAVprefix to CODEC_ID
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
2014-04-01 19:58:51 +02:00
Michael Niedermayer
91b105ce5b
avcodec/ac3dec: avoid #if, use if() instead, its cleaner and shorter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
2014-04-01 19:58:47 +02:00
Michael Niedermayer
b219142921
avcodec/ac3: rename identifier used to select the fixed point variant
...
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>
2014-04-01 19:58:31 +02:00
Nedeljko Babic
696e34a6e1
libavcodec: Implementation of AC3 fixedpoint decoder
...
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 19:01:57 +02:00
Michael Niedermayer
d506deaeaa
avutil/fixed_dsp: remove redundant cast
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 17:57:30 +02:00
Nedeljko Babic
284cfc7180
libavutil: Add fixed_dsp
...
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 17:36:33 +02:00
Michael Niedermayer
254f653b24
avcodec/jpeglsdec: add PAL8 support
...
Fixes Ticket3478
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 13:43:44 +02:00
Martin Storsjö
66d04c068a
fate: Explicitly use gray16le in fate-sgi-gray16
...
This fixes the test on big endian.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-04-01 12:05:15 +03:00
Michael Niedermayer
879072018f
avcodec/exr: use av_freep() for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 05:18:26 +02:00
Michael Niedermayer
9595f36700
Makefile: fix out of tree builds of .m files
...
should fix fate failures on darwin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 05:12:39 +02:00
Michael Niedermayer
6537b89843
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add SGI tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 04:52:20 +02:00
Michael Niedermayer
767b1daf4b
Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'
...
* commit 'd613091f8858d87789916e2bd7a84ea3144077d4':
sgi: decode 16bit RLE images
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 04:19:27 +02:00
Michael Niedermayer
4ebfcd62af
Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'
...
* commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38':
sgi: encode images with 4 channels at 8 and 16 bits
Conflicts:
Changelog
libavcodec/sgienc.c
See: 21a1006109
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 04:13:53 +02:00
Michael Niedermayer
23290c86bf
Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'
...
* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f':
sgi: decode images with 4 channels at 8 and 16 bits
Conflicts:
Changelog
See: 0b1f20e23c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 04:03:31 +02:00
Michael Niedermayer
5628b9f5fb
Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'
...
* commit 'ab7c64624a1254d509b71c2a4945336567e93845':
sgi: remove redundant argument from read_uncompressed_sgi()
Conflicts:
libavcodec/sgidec.c
See: 0f65693529
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:55:45 +02:00
Michael Niedermayer
5b03caf949
Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'
...
* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd':
sgi: set the row boundary to the correct value
Conflicts:
libavcodec/sgidec.c
See: 39c56ef921
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:51:52 +02:00
Michael Niedermayer
013aa222c6
Merge commit '0279d1d0946a854aa08919abd05b7f2da433823e'
...
* commit '0279d1d0946a854aa08919abd05b7f2da433823e':
sgi: fix end of line boundary detection
See: 6fd7bf7b03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:42:47 +02:00
Michael Niedermayer
b3fa78cea1
Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'
...
* commit 'e7cd53bf662a93330810981f1d057bdf2ead669e':
sgi: check maximum supported resolution
Conflicts:
libavcodec/sgienc.c
See: 59352cc219
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:37:27 +02:00
Michael Niedermayer
be4ae3f532
Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'
...
* commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f':
sgi: K&R formatting cosmetics
Conflicts:
libavcodec/sgidec.c
libavcodec/sgienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:29:29 +02:00
Michael Niedermayer
0054bbd664
Merge commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37'
...
* commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37':
codec_desc: set lossless attribute for SGI and DPX
Conflicts:
libavcodec/codec_desc.c
See: 5b802cf567
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:27:10 +02:00
Michael Niedermayer
42138f6357
Merge commit '06688e96fb9577bc7466a380bf7a14fa745208db'
...
* commit '06688e96fb9577bc7466a380bf7a14fa745208db':
fate: add exr tests
Conflicts:
tests/fate/image.mak
See: 87888c043d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:24:50 +02:00
Michael Niedermayer
95582b5ccc
Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'
...
* 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-01 03:16:56 +02:00
Michael Niedermayer
9e3c8f61fe
Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'
...
* commit '678e455f1dc09265464b13d936d9fda62bc2bf43':
dxva2: Directly use AVFrames
Conflicts:
libavcodec/dxva2_h264.c
See: 29be9b5301
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 02:08:19 +02:00
Vittorio Giovara
55c6e59906
fate: add SGI tests
2014-04-01 01:19:04 +02:00
Vittorio Giovara
d613091f88
sgi: decode 16bit RLE images
2014-04-01 01:19:03 +02:00
Vittorio Giovara
6c1df1f228
sgi: encode images with 4 channels at 8 and 16 bits
2014-04-01 01:19:03 +02:00
Carl Eugen Hoyos
f8dea10d3f
sgi: decode images with 4 channels at 8 and 16 bits
2014-04-01 01:19:03 +02:00