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
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
2014-03-31 21:49:02 +02:00
Michael Niedermayer
4a6dce9f9f
Merge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'
...
* commit 'cd60631752cafe106b406f00966ac0323ad2ce1f':
libx265: Bump version requirement
See: 32998ee957
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
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
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
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
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
2014-03-31 01:58:14 +02:00
Michael Niedermayer
20bc5924a0
Merge commit '96138e8c8da4b9397e627c934a33c22988d1192b'
...
* commit '96138e8c8da4b9397e627c934a33c22988d1192b':
isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Conflicts:
libavformat/isom.c
See: b6ad5893ce
2014-03-31 01:55:12 +02:00
Michael Niedermayer
36d37edf01
Merge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'
...
* commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3':
isom: Simplify mov_rewrite_dvd_sub_extradata()
Conflicts:
libavformat/isom.c
See: f6f3c85c0e
2014-03-31 01:44:13 +02:00
Michael Niedermayer
8e8276e0bc
Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'
...
* commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a':
fate: Convert the paletted output in the brenderpix tests to rgb24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 01:32:02 +02:00
Timothy Gu
09fda6bb50
libmp3lame: add ABR support
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
Paul B Mahol
729d821fd8
libmp3lame: allow joint stereo to be disabled
2014-03-31 01:11:16 +02:00
Michael Niedermayer
12789d9636
mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
...
This also moves mov_rewrite_dvd_sub_extradata() to mov.c.
Sample-Id: NeroRecodeSample.mp4
2014-03-31 01:08:23 +02:00
Michael Niedermayer
fce28c3c6d
mov: fill in subtitle dimensions after parsing tkhd
...
Sample-Id: NeroRecodeSample.mp4
2014-03-31 01:08:18 +02:00
Michael Niedermayer
96138e8c8d
isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
...
Sample-Id: NeroRecodeSample.mp4
2014-03-31 01:08:12 +02:00
Michael Niedermayer
9bd4a9f4ee
isom: Simplify mov_rewrite_dvd_sub_extradata()
...
This avoids the 2nd buffer and fixes the palette truncated check
2014-03-31 01:05:11 +02:00
Martin Storsjö
3e4e2142d2
fate: Convert the paletted output in the brenderpix tests to rgb24
...
This makes the output consistent on big-endian systems.
2014-03-31 01:04:05 +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
Thilo Borgmann
6d9bdd9d8b
doc/indevs: Fix example for QTKit usage.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 21:29:25 +02:00
Michael Niedermayer
9c77e57393
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: make the ASCII flow charts narrower to fit onto TTY
Conflicts:
doc/ffmpeg.texi
See: 8fe1076094
2014-03-30 21:20:58 +02:00
Michael Niedermayer
f22d9b1e0b
Merge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d'
...
* commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d':
dnxhdenc: return meaningful return codes
Conflicts:
libavcodec/dnxhdenc.c
See: b9bedb0b28
2014-03-30 21:11:01 +02:00
Michael Niedermayer
ce0ec108cd
Merge commit '9e4e35b4d7c43a908944183a58aa389a23116fd6'
...
* commit '9e4e35b4d7c43a908944183a58aa389a23116fd6':
avconv_opt: fix avio_open2() return code check
See: 774239be71
2014-03-30 21:00:14 +02:00
Vadim Kalinsky
234f0bcb0c
lavd: Add QTKit input device.
...
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 20:45:07 +02:00
Timothy Gu
3a5a965493
avconv: make the ASCII flow charts narrower to fit onto TTY
...
These charts in man page are currently destroyed.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-30 18:02:14 +02:00
Peter Ross
92d657b5f1
avformat/wtvenc: advise user when H264 startcode is not present
...
Fixes ticket #3473 .
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 16:36:47 +02:00
Peter Ross
e61973db6c
avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 16:36:22 +02:00
