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
Paul B Mahol
ab7c64624a
sgi: remove redundant argument from read_uncompressed_sgi()
2014-04-01 01:19:03 +02:00
Michael Niedermayer
6d9ccee451
sgi: set the row boundary to the correct value
2014-04-01 01:18:55 +02:00
Michael Niedermayer
d56c373391
avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2
...
Fixes Ticket3516
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 01:14:26 +02:00
Michael Niedermayer
0279d1d094
sgi: fix end of line boundary detection
2014-04-01 01:13:18 +02:00
Piotr Bandurski
e7cd53bf66
sgi: check maximum supported resolution
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-01 01:13:18 +02:00
Vittorio Giovara
a7dbfcf6cb
sgi: K&R formatting cosmetics
2014-04-01 01:13:18 +02:00
Paul B Mahol
ca36aa9e6b
codec_desc: set lossless attribute for SGI and DPX
2014-04-01 01:13:17 +02:00
Paul B Mahol
06688e96fb
fate: add exr tests
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-01 01:13:17 +02:00
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>
2014-04-01 01:13:09 +02:00
Michael Niedermayer
678e455f1d
dxva2: Directly use AVFrames
...
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-01 00:10:15 +02:00
Michael Niedermayer
1f361124d9
avformat/img2dec: zero probe buffer
...
Fixes use of uninitialized memory
Fixes valgrind failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 23:47:29 +02:00
rogerdpack
0cc8a62a78
dshow: fixup some COM objects, based on patches from Don Moir
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 23:11:35 +02:00
Thilo Borgmann
d5c0036d4a
lavd/qtkit: Fix non-constant initializer element for some clang compilers.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 22:21:07 +02:00
Michael Niedermayer
9d013fe840
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mov: Unbreak sbtl writing
Conflicts:
libavformat/movenc.c
See: 8a9d0a1561
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 22:08:11 +02:00
Michael Niedermayer
0f714abb49
Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'
...
* commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80':
vc1dec: improve hwaccel #ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 22:04:25 +02:00
Michael Niedermayer
c43ebd94e4
Merge commit '33259118155764ce27a3433894659dda1d148b5f'
...
* commit '33259118155764ce27a3433894659dda1d148b5f':
h263: improve hwaccel #ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 21:50:24 +02:00
Michael Niedermayer
4ea333d7de
Merge commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081'
...
* commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081':
libx265: Use the repeat headers flag when not using global headers
See: 1b28d9b357
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 21:49:02 +02:00
Michael Niedermayer
4a6dce9f9f
Merge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'
...
* commit 'cd60631752cafe106b406f00966ac0323ad2ce1f':
libx265: Bump version requirement
See: 32998ee957
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 20:26:48 +02:00
Michael Niedermayer
f94371b1db
mov: Unbreak sbtl writing
2014-03-31 19:31:41 +02:00
Rémi Denis-Courmont
654c7446a8
vc1dec: improve hwaccel #ifdefs
2014-03-31 17:52:42 +02:00
Rémi Denis-Courmont
3325911815
h263: improve hwaccel #ifdefs
2014-03-31 17:52:38 +02:00
Michael Niedermayer
559c8b9ee9
avcodec/mjpegdec: support subsampled 420 CMYK
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 17:47:04 +02:00
Michael Niedermayer
798490812a
avcodec/mjpegdec: upgrade upscale_v to support multiple planes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 17:47:04 +02:00
Michael Niedermayer
f9059ce794
avcodec/mjpegdec: upgrade upscale_h to support multiple planes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 17:47:04 +02:00
Marcus Gustafsson
c042cbc3a6
libx265: Use the repeat headers flag when not using global headers
...
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-31 16:24:05 +01:00
Derek Buitenhuis
cd60631752
libx265: Bump version requirement
...
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-31 16:24:05 +01:00
Marcus Gustafsson
1b28d9b357
libx265: Use the repeat headers flag when not using global headers
...
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-31 13:13:46 +01:00
Derek Buitenhuis
32998ee957
libx265: Bump version requirement
...
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-31 13:13:45 +01:00
Peter Ross
bf7d93e157
avcodec/adpcm: also squelch 'mismatch in coded sample count' warning for 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-31 13:18:19 +02:00
Thilo Borgmann
a9ccec5270
configure: Remove invalid option --disable-qtkit.
...
QTKit can/should be disabled by "--disable-indev=qtkit".
Found by Justin Derrick.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 13:14:39 +02:00
Michael Niedermayer
e818ee090a
avfilter/vf_pullup: fix gray8
...
Fixes segfault
Fixes Ticket3469
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 03:22:20 +02:00
Michael Niedermayer
75621cdf5d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libmp3lame: add ABR support
Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h
See: d3211cfaed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 02:23:26 +02:00
Michael Niedermayer
e4fc7e3d4d
Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'
...
* commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73':
libmp3lame: add comments about CBR/VBR modes
Conflicts:
libavcodec/libmp3lame.c
See: 07e7bc9cbd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 02:18:24 +02:00
Michael Niedermayer
801b94a782
Merge commit '729d821fd864a0568f4068e64d3a70faa23b9309'
...
* commit '729d821fd864a0568f4068e64d3a70faa23b9309':
libmp3lame: allow joint stereo to be disabled
Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h
See: 1de11a7cab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 02:16:41 +02:00
Michael Niedermayer
46ff8108f6
Merge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'
...
* commit '12789d96361ed8e9804bfbb9db31ea4110e75c58':
mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
Conflicts:
libavformat/isom.c
See: e21235f9b9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 02:10:01 +02:00
Michael Niedermayer
1ffbaa88c9
Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'
...
* commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8':
mov: fill in subtitle dimensions after parsing tkhd
See: 8ba432bc56
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 01:58:14 +02:00