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
767b1daf4b
Merge commit ' d613091f88'
...
* commit 'd613091f88 ':
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 ' 6c1df1f228'
...
* commit '6c1df1f228 ':
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
5628b9f5fb
Merge commit ' ab7c64624a'
...
* commit 'ab7c64624a ':
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 ' 6d9ccee451'
...
* commit '6d9ccee451 ':
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
b3fa78cea1
Merge commit ' e7cd53bf66'
...
* commit 'e7cd53bf66 ':
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 ' a7dbfcf6cb'
...
* commit 'a7dbfcf6cb ':
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
95582b5ccc
Merge commit ' 38389058c3'
...
* commit '38389058c3 ':
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
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
Paul B Mahol
ab7c64624a
sgi: remove redundant argument from read_uncompressed_sgi()
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
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
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
Michael Niedermayer
0279d1d094
sgi: fix end of line boundary detection
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
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
0f714abb49
Merge commit ' 654c7446a8'
...
* commit '654c7446a8 ':
vc1dec: improve hwaccel #ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 22:04:25 +02:00
Michael Niedermayer
c43ebd94e4
Merge commit ' 3325911815'
...
* commit '3325911815 ':
h263: improve hwaccel #ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 21:50:24 +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
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
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
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
801b94a782
Merge commit ' 729d821fd8'
...
* commit '729d821fd8 ':
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
Timothy Gu
09fda6bb50
libmp3lame: add ABR support
2014-03-31 01:11:16 +02:00
Paul B Mahol
729d821fd8
libmp3lame: allow joint stereo to be disabled
2014-03-31 01:11:16 +02:00
Timothy Gu
292dbe5e8a
libmp3lame: add comments about CBR/VBR modes
2014-03-31 01:11:16 +02:00
Matt Oliver
0f2588d7e5
Use intel compliant CDQ instead of CLTD in inline asm.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 23:14:36 +02:00
Timothy Gu
68e95ab81b
dnxhdenc: return meaningful return codes
2014-03-30 14:55:09 +02:00
Michael Niedermayer
30e159366e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
golomb: Fix the implementation of get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 03:03:28 +02:00
Michael Niedermayer
ae3313e154
Merge commit ' 53c20f17c7'
...
* commit '53c20f17c7 ':
vp8: K&R formatting cosmetics
Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 01:55:31 +01:00
Martin Storsjö
508a84e672
golomb: Fix the implementation of get_se_golomb_long
...
This was only used in hevc muxing code so far.
This makes the return values match what get_se_golomb returns for
the same bitstream reader instances.
The logic for producing a signed golomb code out of an unsigned one
was based on the corresponding code in get_se_golomb, which operated
directly on the bitstream reader buffer - not on the equivalent
return value from get_ue_golomb.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-30 00:28:27 +02:00
Clément Bœsch
af3b6aed0d
avcodec/vp9dsp: fix typo in mc doxy.
2014-03-29 18:13:15 +01:00
Clément Bœsch
c4148a6668
x86/vp9mc: add vp9 namespace.
2014-03-29 18:13:15 +01:00
Vittorio Giovara
53c20f17c7
vp8: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-03-29 16:11:09 +01:00
Michael Niedermayer
46f72ea507
avcodec/vp7: check buffer size
...
Fixes overread
Fixes Ticket 3501
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29 04:27:00 +01:00
Michael Niedermayer
067ada04d1
avcodec/xbmdec: redesign parser to handle more cases
...
The new code is more tolerant on the syntax
Fixes decoding of bm1.xbm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29 03:50:25 +01:00
Michael Niedermayer
a696b0917d
Merge commit ' fb5cf145b6'
...
* commit 'fb5cf145b6 ':
bmp: add a standalone parser
Conflicts:
Changelog
libavcodec/bmp_parser.c
libavcodec/version.h
See: 011ce89dba and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 11:00:27 +01:00
Michael Niedermayer
1da1866767
avcodec/xbmdec: support X10 format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 05:34:25 +01:00
Michael Niedermayer
4618084a5c
avcodec/xbmdec: merge ptr increase into dereference
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 05:33:13 +01:00
Michael Niedermayer
296e63efa5
Merge commit ' 678082b409'
...
* commit '678082b409 ':
X-Bitmap decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavcodec/xbmdec.c
See: a0340dfbd7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 05:26:24 +01:00
Michael Niedermayer
16ddc58bd7
Merge commit ' 70daeacd6e'
...
* commit '70daeacd6e ':
PAF demuxer and decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/paf.c
libavformat/version.h
See: 7de4a16508 , and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 04:32:05 +01:00