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>
11 years ago
Michael Niedermayer
61b3b3315c
Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'
...
* commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509':
lavf: add supported extension to avi and mov demuxers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
Vittorio Giovara
c611148340
vc1dec: fix a possible unitialized variable warning
11 years ago
Marc-Antoine Arnaud
f1c4a54f6e
lavf: add supported extension to avi and mov demuxers
11 years ago
Diego Biurrun
cba4e6062a
More correct printf format specifiers
...
This avoids compiler warnings about argument and specifier type mismatch.
11 years ago
Janne Grunau
80035db88c
lavu: add missing formats to av_pix_fmt_swap_endianness
11 years ago
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>
11 years ago
Vittorio Giovara
d2264740e6
VP3: K&R formatting cosmetics
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
Michael Niedermayer
d506deaeaa
avutil/fixed_dsp: remove redundant cast
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Nedeljko Babic
284cfc7180
libavutil: Add fixed_dsp
...
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
254f653b24
avcodec/jpeglsdec: add PAL8 support
...
Fixes Ticket3478
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
Michael Niedermayer
879072018f
avcodec/exr: use av_freep() for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
Michael Niedermayer
6537b89843
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add SGI tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
767b1daf4b
Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'
...
* commit 'd613091f8858d87789916e2bd7a84ea3144077d4':
sgi: decode 16bit RLE images
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
Michael Niedermayer
013aa222c6
Merge commit '0279d1d0946a854aa08919abd05b7f2da433823e'
...
* commit '0279d1d0946a854aa08919abd05b7f2da433823e':
sgi: fix end of line boundary detection
See: 6fd7bf7b03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
Vittorio Giovara
55c6e59906
fate: add SGI tests
11 years ago
Vittorio Giovara
d613091f88
sgi: decode 16bit RLE images
11 years ago
Vittorio Giovara
6c1df1f228
sgi: encode images with 4 channels at 8 and 16 bits
11 years ago
Carl Eugen Hoyos
f8dea10d3f
sgi: decode images with 4 channels at 8 and 16 bits
11 years ago
Paul B Mahol
ab7c64624a
sgi: remove redundant argument from read_uncompressed_sgi()
11 years ago
Michael Niedermayer
6d9ccee451
sgi: set the row boundary to the correct value
11 years ago
Michael Niedermayer
d56c373391
avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2
...
Fixes Ticket3516
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0279d1d094
sgi: fix end of line boundary detection
11 years ago
Piotr Bandurski
e7cd53bf66
sgi: check maximum supported resolution
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
Vittorio Giovara
a7dbfcf6cb
sgi: K&R formatting cosmetics
11 years ago
Paul B Mahol
ca36aa9e6b
codec_desc: set lossless attribute for SGI and DPX
11 years ago
Paul B Mahol
06688e96fb
fate: add exr tests
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
Jimmy Christensen
38389058c3
OpenEXR decoder
...
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>
11 years ago