ffmpeg.git
5 years agoMerge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'
Michael Niedermayer [Tue, 1 Apr 2014 02:19:27 +0000 (04:19 +0200)]
Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'

* commit 'd613091f8858d87789916e2bd7a84ea3144077d4':
  sgi: decode 16bit RLE images

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'
Michael Niedermayer [Tue, 1 Apr 2014 02:09:22 +0000 (04:09 +0200)]
Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'

* commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38':
  sgi: encode images with 4 channels at 8 and 16 bits

Conflicts:
Changelog
libavcodec/sgienc.c

See: 21a100610977a163fe6480b5cf4c25f34f64b86b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'
Michael Niedermayer [Tue, 1 Apr 2014 02:01:28 +0000 (04:01 +0200)]
Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'

* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f':
  sgi: decode images with 4 channels at 8 and 16 bits

Conflicts:
Changelog

See: 0b1f20e23c3d61d06c86ee1aa160cd4da8b47b0c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ab7c64624a1254d509b71c2a4945336567e93845'
Michael Niedermayer [Tue, 1 Apr 2014 01:55:45 +0000 (03:55 +0200)]
Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'

* commit 'ab7c64624a1254d509b71c2a4945336567e93845':
  sgi: remove redundant argument from read_uncompressed_sgi()

Conflicts:
libavcodec/sgidec.c

See: 0f65693529decc470e3f01cb950b1864ea982c06
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'
Michael Niedermayer [Tue, 1 Apr 2014 01:51:32 +0000 (03:51 +0200)]
Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'

* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd':
  sgi: set the row boundary to the correct value

Conflicts:
libavcodec/sgidec.c

See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0279d1d0946a854aa08919abd05b7f2da433823e'
Michael Niedermayer [Tue, 1 Apr 2014 01:42:29 +0000 (03:42 +0200)]
Merge commit '0279d1d0946a854aa08919abd05b7f2da433823e'

* commit '0279d1d0946a854aa08919abd05b7f2da433823e':
  sgi: fix end of line boundary detection

See: 6fd7bf7b03c068d0f91de03bdd9b4e91695680eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'
Michael Niedermayer [Tue, 1 Apr 2014 01:37:02 +0000 (03:37 +0200)]
Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'

* commit 'e7cd53bf662a93330810981f1d057bdf2ead669e':
  sgi: check maximum supported resolution

Conflicts:
libavcodec/sgienc.c

See: 59352cc219c4f933c9a83b45043ec4810c2a51ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'
Michael Niedermayer [Tue, 1 Apr 2014 01:29:29 +0000 (03:29 +0200)]
Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'

* commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f':
  sgi: K&R formatting cosmetics

Conflicts:
libavcodec/sgidec.c
libavcodec/sgienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37'
Michael Niedermayer [Tue, 1 Apr 2014 01:26:40 +0000 (03:26 +0200)]
Merge commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37'

* commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37':
  codec_desc: set lossless attribute for SGI and DPX

Conflicts:
libavcodec/codec_desc.c

See: 5b802cf567a0ee7a2990e08d08f8aa0abffbb7d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '06688e96fb9577bc7466a380bf7a14fa745208db'
Michael Niedermayer [Tue, 1 Apr 2014 01:23:36 +0000 (03:23 +0200)]
Merge commit '06688e96fb9577bc7466a380bf7a14fa745208db'

* commit '06688e96fb9577bc7466a380bf7a14fa745208db':
  fate: add exr tests

Conflicts:
tests/fate/image.mak

See: 87888c043da9da407b3c601c47089163ff0e78d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'
Michael Niedermayer [Tue, 1 Apr 2014 01:05:36 +0000 (03:05 +0200)]
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>
5 years agoMerge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'
Michael Niedermayer [Tue, 1 Apr 2014 00:05:41 +0000 (02:05 +0200)]
Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'

* commit '678e455f1dc09265464b13d936d9fda62bc2bf43':
  dxva2: Directly use AVFrames

Conflicts:
libavcodec/dxva2_h264.c

See: 29be9b5301212d29186a05f262a6ce04ddbc168c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosgi: decode 16bit RLE images
Vittorio Giovara [Thu, 13 Mar 2014 14:14:37 +0000 (15:14 +0100)]
sgi: decode 16bit RLE images

5 years agosgi: encode images with 4 channels at 8 and 16 bits
Vittorio Giovara [Thu, 13 Mar 2014 00:19:12 +0000 (01:19 +0100)]
sgi: encode images with 4 channels at 8 and 16 bits

5 years agosgi: decode images with 4 channels at 8 and 16 bits
Carl Eugen Hoyos [Sat, 14 Jan 2012 00:14:51 +0000 (01:14 +0100)]
sgi: decode images with 4 channels at 8 and 16 bits

5 years agosgi: remove redundant argument from read_uncompressed_sgi()
Paul B Mahol [Sun, 8 Jul 2012 23:28:16 +0000 (23:28 +0000)]
sgi: remove redundant argument from read_uncompressed_sgi()

5 years agosgi: set the row boundary to the correct value
Michael Niedermayer [Sun, 12 Aug 2012 03:31:14 +0000 (05:31 +0200)]
sgi: set the row boundary to the correct value

5 years agoavcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2
Michael Niedermayer [Mon, 31 Mar 2014 23:14:26 +0000 (01:14 +0200)]
avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2

Fixes Ticket3516

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosgi: fix end of line boundary detection
Michael Niedermayer [Sun, 12 Aug 2012 03:32:07 +0000 (05:32 +0200)]
sgi: fix end of line boundary detection

5 years agosgi: check maximum supported resolution
Piotr Bandurski [Thu, 31 May 2012 18:10:04 +0000 (20:10 +0200)]
sgi: check maximum supported resolution

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agosgi: K&R formatting cosmetics
Vittorio Giovara [Thu, 13 Mar 2014 14:20:00 +0000 (15:20 +0100)]
sgi: K&R formatting cosmetics

5 years agocodec_desc: set lossless attribute for SGI and DPX
Paul B Mahol [Fri, 1 Mar 2013 15:22:02 +0000 (15:22 +0000)]
codec_desc: set lossless attribute for SGI and DPX

5 years agofate: add exr tests
Paul B Mahol [Sun, 24 Feb 2013 21:51:31 +0000 (21:51 +0000)]
fate: add exr tests

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoOpenEXR decoder
Jimmy Christensen [Fri, 6 Apr 2012 06:02:25 +0000 (06:02 +0000)]
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>
5 years agodxva2: Directly use AVFrames
Michael Niedermayer [Mon, 31 Mar 2014 14:24:10 +0000 (14:24 +0000)]
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>
5 years agoavformat/img2dec: zero probe buffer
Michael Niedermayer [Mon, 31 Mar 2014 21:42:08 +0000 (23:42 +0200)]
avformat/img2dec: zero probe buffer

Fixes use of uninitialized memory
Fixes valgrind failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodshow: fixup some COM objects, based on patches from Don Moir
rogerdpack [Thu, 27 Mar 2014 20:37:48 +0000 (14:37 -0600)]
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>
5 years agolavd/qtkit: Fix non-constant initializer element for some clang compilers.
Thilo Borgmann [Mon, 31 Mar 2014 12:16:26 +0000 (14:16 +0200)]
lavd/qtkit: Fix non-constant initializer element for some clang compilers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 31 Mar 2014 20:07:34 +0000 (22:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov: Unbreak sbtl writing

Conflicts:
libavformat/movenc.c

See: 8a9d0a1561470a185a3d09676fcf9b44830a4bfe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'
Michael Niedermayer [Mon, 31 Mar 2014 19:58:26 +0000 (21:58 +0200)]
Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'

* commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80':
  vc1dec: improve hwaccel #ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '33259118155764ce27a3433894659dda1d148b5f'
Michael Niedermayer [Mon, 31 Mar 2014 19:49:58 +0000 (21:49 +0200)]
Merge commit '33259118155764ce27a3433894659dda1d148b5f'

* commit '33259118155764ce27a3433894659dda1d148b5f':
  h263: improve hwaccel #ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081'
Michael Niedermayer [Mon, 31 Mar 2014 18:34:18 +0000 (20:34 +0200)]
Merge commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081'

* commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081':
  libx265: Use the repeat headers flag when not using global headers

See: 1b28d9b357db2b6f8360e68c03247d3b81655b10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'
Michael Niedermayer [Mon, 31 Mar 2014 18:24:45 +0000 (20:24 +0200)]
Merge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'

* commit 'cd60631752cafe106b406f00966ac0323ad2ce1f':
  libx265: Bump version requirement

See: 32998ee9577ab32d11c4704fde527df0e982092d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov: Unbreak sbtl writing
Michael Niedermayer [Sat, 29 Mar 2014 14:56:03 +0000 (15:56 +0100)]
mov: Unbreak sbtl writing

5 years agovc1dec: improve hwaccel #ifdefs
Rémi Denis-Courmont [Tue, 25 Mar 2014 20:19:58 +0000 (20:19 +0000)]
vc1dec: improve hwaccel #ifdefs

5 years agoh263: improve hwaccel #ifdefs
Rémi Denis-Courmont [Tue, 25 Mar 2014 20:19:57 +0000 (20:19 +0000)]
h263: improve hwaccel #ifdefs

5 years agoavcodec/mjpegdec: support subsampled 420 CMYK
Michael Niedermayer [Mon, 31 Mar 2014 15:04:38 +0000 (17:04 +0200)]
avcodec/mjpegdec: support subsampled 420 CMYK

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: upgrade upscale_v to support multiple planes
Michael Niedermayer [Mon, 31 Mar 2014 13:52:15 +0000 (15:52 +0200)]
avcodec/mjpegdec: upgrade upscale_v to support multiple planes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: upgrade upscale_h to support multiple planes
Michael Niedermayer [Mon, 31 Mar 2014 13:27:41 +0000 (15:27 +0200)]
avcodec/mjpegdec: upgrade upscale_h to support multiple planes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibx265: Use the repeat headers flag when not using global headers
Marcus Gustafsson [Tue, 25 Mar 2014 20:51:21 +0000 (21:51 +0100)]
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>
5 years agolibx265: Bump version requirement
Derek Buitenhuis [Sun, 30 Mar 2014 14:58:14 +0000 (15:58 +0100)]
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>
5 years agolibx265: Use the repeat headers flag when not using global headers
Marcus Gustafsson [Tue, 25 Mar 2014 20:51:21 +0000 (21:51 +0100)]
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>
5 years agolibx265: Bump version requirement
Derek Buitenhuis [Sun, 30 Mar 2014 14:58:14 +0000 (15:58 +0100)]
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>
5 years agoavcodec/adpcm: also squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_...
Peter Ross [Mon, 31 Mar 2014 10:56:43 +0000 (21:56 +1100)]
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>
5 years agoconfigure: Remove invalid option --disable-qtkit.
Thilo Borgmann [Mon, 31 Mar 2014 10:12:02 +0000 (12:12 +0200)]
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>
5 years agoavfilter/vf_pullup: fix gray8
Michael Niedermayer [Mon, 31 Mar 2014 01:22:20 +0000 (03:22 +0200)]
avfilter/vf_pullup: fix gray8

Fixes segfault
Fixes Ticket3469

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 31 Mar 2014 00:21:57 +0000 (02:21 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libmp3lame: add ABR support

Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h

See: d3211cfaedcc0abf30e3a40c246237090ad95b6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'
Michael Niedermayer [Mon, 31 Mar 2014 00:18:24 +0000 (02:18 +0200)]
Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'

* commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73':
  libmp3lame: add comments about CBR/VBR modes

Conflicts:
libavcodec/libmp3lame.c

See: 07e7bc9cbda12921ddf0ae6bbbf9328f29c3c63e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '729d821fd864a0568f4068e64d3a70faa23b9309'
Michael Niedermayer [Mon, 31 Mar 2014 00:15:11 +0000 (02:15 +0200)]
Merge commit '729d821fd864a0568f4068e64d3a70faa23b9309'

* commit '729d821fd864a0568f4068e64d3a70faa23b9309':
  libmp3lame: allow joint stereo to be disabled

Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h

See: 1de11a7cab5346030a134774fbc23b3fc523a003
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'
Michael Niedermayer [Mon, 31 Mar 2014 00:08:45 +0000 (02:08 +0200)]
Merge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'

* commit '12789d96361ed8e9804bfbb9db31ea4110e75c58':
  mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

Conflicts:
libavformat/isom.c

See: e21235f9b9e264111279847617bb7bdaa734b11a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'
Michael Niedermayer [Sun, 30 Mar 2014 23:55:58 +0000 (01:55 +0200)]
Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'

* commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8':
  mov: fill in subtitle dimensions after parsing tkhd

See: 8ba432bc56f2d3ef534be7d3ccc1c9b3c0ea3091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '96138e8c8da4b9397e627c934a33c22988d1192b'
Michael Niedermayer [Sun, 30 Mar 2014 23:51:34 +0000 (01:51 +0200)]
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: b6ad5893ce585ac6d0a5a4750cba6bb700dbc902
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'
Michael Niedermayer [Sun, 30 Mar 2014 23:41:21 +0000 (01:41 +0200)]
Merge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'

* commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3':
  isom: Simplify mov_rewrite_dvd_sub_extradata()

Conflicts:
libavformat/isom.c

See: f6f3c85c0eff54cebc3a45caa7a1e0454b5c9ff8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'
Michael Niedermayer [Sun, 30 Mar 2014 23:31:50 +0000 (01:31 +0200)]
Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'

* commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a':
  fate: Convert the paletted output in the brenderpix tests to rgb24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibmp3lame: add ABR support
Timothy Gu [Sat, 2 Nov 2013 02:43:24 +0000 (19:43 -0700)]
libmp3lame: add ABR support

5 years agolibmp3lame: add comments about CBR/VBR modes
Timothy Gu [Thu, 24 Oct 2013 03:57:36 +0000 (20:57 -0700)]
libmp3lame: add comments about CBR/VBR modes

5 years agolibmp3lame: allow joint stereo to be disabled
Paul B Mahol [Sat, 30 Mar 2013 22:15:50 +0000 (22:15 +0000)]
libmp3lame: allow joint stereo to be disabled

5 years agomov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
Michael Niedermayer [Thu, 20 Mar 2014 07:05:37 +0000 (07:05 +0000)]
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

5 years agomov: fill in subtitle dimensions after parsing tkhd
Michael Niedermayer [Thu, 20 Mar 2014 07:05:36 +0000 (07:05 +0000)]
mov: fill in subtitle dimensions after parsing tkhd

Sample-Id: NeroRecodeSample.mp4

5 years agoisom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Michael Niedermayer [Thu, 20 Mar 2014 07:05:35 +0000 (07:05 +0000)]
isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Sample-Id: NeroRecodeSample.mp4

5 years agoisom: Simplify mov_rewrite_dvd_sub_extradata()
Michael Niedermayer [Thu, 20 Mar 2014 07:05:34 +0000 (07:05 +0000)]
isom: Simplify mov_rewrite_dvd_sub_extradata()

This avoids the 2nd buffer and fixes the palette truncated check

5 years agofate: Convert the paletted output in the brenderpix tests to rgb24
Martin Storsjö [Sun, 30 Mar 2014 18:27:58 +0000 (18:27 +0000)]
fate: Convert the paletted output in the brenderpix tests to rgb24

This makes the output consistent on big-endian systems.

5 years agoUse intel compliant CDQ instead of CLTD in inline asm.
Matt Oliver [Sun, 30 Mar 2014 01:34:49 +0000 (12:34 +1100)]
Use intel compliant CDQ instead of CLTD in inline asm.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/indevs: Fix example for QTKit usage.
Thilo Borgmann [Sun, 30 Mar 2014 19:14:17 +0000 (21:14 +0200)]
doc/indevs: Fix example for QTKit usage.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 30 Mar 2014 19:19:40 +0000 (21:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:
doc/ffmpeg.texi

See: 8fe107609437909ddd2cf8f5690fe0158a0616f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d'
Michael Niedermayer [Sun, 30 Mar 2014 19:08:45 +0000 (21:08 +0200)]
Merge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d'

* commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d':
  dnxhdenc: return meaningful return codes

Conflicts:
libavcodec/dnxhdenc.c

See: b9bedb0b287d3aaa30540d18fdb87b2cc98ca339
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9e4e35b4d7c43a908944183a58aa389a23116fd6'
Michael Niedermayer [Sun, 30 Mar 2014 18:58:45 +0000 (20:58 +0200)]
Merge commit '9e4e35b4d7c43a908944183a58aa389a23116fd6'

* commit '9e4e35b4d7c43a908944183a58aa389a23116fd6':
  avconv_opt: fix avio_open2() return code check

See: 774239be717150909219ad2c0696bfb6a50cf2cb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd: Add QTKit input device.
Vadim Kalinsky [Mon, 24 Mar 2014 09:55:35 +0000 (10:55 +0100)]
lavd: Add QTKit input device.

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavconv: make the ASCII flow charts narrower to fit onto TTY
Timothy Gu [Fri, 7 Feb 2014 00:20:58 +0000 (16:20 -0800)]
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>
5 years agoavformat/wtvenc: advise user when H264 startcode is not present
Peter Ross [Sun, 30 Mar 2014 01:42:05 +0000 (12:42 +1100)]
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>
5 years agoavformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode
Peter Ross [Sun, 30 Mar 2014 01:41:01 +0000 (12:41 +1100)]
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>
5 years agoavformat/avio: also set generic URL context options
Michael Niedermayer [Sun, 30 Mar 2014 12:51:59 +0000 (14:51 +0200)]
avformat/avio: also set generic URL context options

This should have no effect currently as there are no such options yet.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: dont crash on av_opt_set_dict() with NULL
Michael Niedermayer [Sun, 30 Mar 2014 12:58:46 +0000 (14:58 +0200)]
avutil/opt: dont crash on av_opt_set_dict() with NULL

This allows calling the function without the need to check if the
dictionary contains any entries

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodnxhdenc: return meaningful return codes
Timothy Gu [Sat, 29 Mar 2014 20:59:46 +0000 (20:59 +0000)]
dnxhdenc: return meaningful return codes

5 years agoavconv_opt: fix avio_open2() return code check
Timothy Gu [Sat, 29 Mar 2014 20:59:45 +0000 (20:59 +0000)]
avconv_opt: fix avio_open2() return code check

avio_open2() only return < 0 when error.

5 years agoavformat/wtvenc: pad judiciously when writing mpeg2 extradata
Peter Ross [Sun, 30 Mar 2014 01:43:50 +0000 (12:43 +1100)]
avformat/wtvenc: pad judiciously when writing mpeg2 extradata

Padding rule described here http://msdn.microsoft.com/en-us/library/windows/desktop/dd390707(v=vs.85).aspx

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wtvdec: demux mpeg2 extradata
Peter Ross [Sun, 30 Mar 2014 01:43:19 +0000 (12:43 +1100)]
avformat/wtvdec: demux mpeg2 extradata

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/replaygain: remove unused variable
Michael Niedermayer [Sun, 30 Mar 2014 01:23:13 +0000 (03:23 +0200)]
avformat/replaygain: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 30 Mar 2014 01:02:43 +0000 (03:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: Fix the implementation of get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'
Michael Niedermayer [Sun, 30 Mar 2014 00:39:46 +0000 (01:39 +0100)]
Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'

* commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5':
  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>
5 years agogolomb: Fix the implementation of get_se_golomb_long
Martin Storsjö [Sat, 29 Mar 2014 10:35:11 +0000 (12:35 +0200)]
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>
5 years agoavcodec/vp9dsp: fix typo in mc doxy.
Clément Bœsch [Sat, 29 Mar 2014 16:28:37 +0000 (17:28 +0100)]
avcodec/vp9dsp: fix typo in mc doxy.

5 years agox86/vp9mc: add vp9 namespace.
Clément Bœsch [Fri, 28 Mar 2014 21:33:51 +0000 (22:33 +0100)]
x86/vp9mc: add vp9 namespace.

5 years agoMerge commit 'lukaszmluki/master^'
Michael Niedermayer [Sat, 29 Mar 2014 15:28:28 +0000 (16:28 +0100)]
Merge commit 'lukaszmluki/master^'

* commit 'lukaszmluki/master^':
  lavd/pulse_audio_enc: implement get_device_list callback
  lavd/pulse_audio_dec: implement get_device_list callback
  lavd/pulse_audio_common: add device detecting code
  lavu/mem: add av_dynarray_add_nofree function
  lavd/pulse_audio_enc: implement write_uncoded_frame callback
  tools/uncoded_frame: fix audio codec generation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp8: K&R formatting cosmetics
Vittorio Giovara [Fri, 28 Mar 2014 00:13:54 +0000 (01:13 +0100)]
vp8: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavformat/movenc: fix if vs if else
Michael Niedermayer [Sat, 29 Mar 2014 14:38:20 +0000 (15:38 +0100)]
avformat/movenc: fix if vs if else

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 29 Mar 2014 14:03:24 +0000 (15:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Add dvd subtitle support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '85698be461c07be10d873dd34348bcfe9ffc56e0'
Michael Niedermayer [Sat, 29 Mar 2014 13:33:10 +0000 (14:33 +0100)]
Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0'

* commit '85698be461c07be10d873dd34348bcfe9ffc56e0':
  cmdutils: Mark exit_program as av_noreturn

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/pulse_audio_enc: implement get_device_list callback
Lukasz Marek [Tue, 25 Feb 2014 00:04:15 +0000 (01:04 +0100)]
lavd/pulse_audio_enc: implement get_device_list callback

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd/pulse_audio_dec: implement get_device_list callback
Lukasz Marek [Tue, 25 Feb 2014 00:04:02 +0000 (01:04 +0100)]
lavd/pulse_audio_dec: implement get_device_list callback

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd/pulse_audio_common: add device detecting code
Lukasz Marek [Tue, 25 Feb 2014 00:03:56 +0000 (01:03 +0100)]
lavd/pulse_audio_common: add device detecting code

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavu/mem: add av_dynarray_add_nofree function
Lukasz Marek [Tue, 25 Feb 2014 00:06:06 +0000 (01:06 +0100)]
lavu/mem: add av_dynarray_add_nofree function

av_dynarray_add_nofree function have similar functionality
as existing av_dynarray_add, but it doesn't deallocate memory
on fails.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd/pulse_audio_enc: implement write_uncoded_frame callback
Lukasz Marek [Mon, 24 Mar 2014 16:55:07 +0000 (17:55 +0100)]
lavd/pulse_audio_enc: implement write_uncoded_frame callback

Provided implementation doesn't support planar formats yet.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agotools/uncoded_frame: fix audio codec generation
Lukasz Marek [Mon, 24 Mar 2014 16:49:04 +0000 (17:49 +0100)]
tools/uncoded_frame: fix audio codec generation

Codec id is guessed from uninitialized sample format.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoavcodec/vp7: check buffer size
Michael Niedermayer [Sat, 29 Mar 2014 03:25:50 +0000 (04:25 +0100)]
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>
5 years agoavcodec/xbmdec: redesign parser to handle more cases
Michael Niedermayer [Sat, 29 Mar 2014 02:18:45 +0000 (03:18 +0100)]
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>
5 years agoavformat/img2_alias_pix: rewrite probe function
Michael Niedermayer [Fri, 28 Mar 2014 23:16:43 +0000 (00:16 +0100)]
avformat/img2_alias_pix: rewrite probe function

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing
Michael Niedermayer [Fri, 28 Mar 2014 23:18:56 +0000 (00:18 +0100)]
avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: Use avformat probing interface to identify format if it has not...
Michael Niedermayer [Fri, 28 Mar 2014 16:24:48 +0000 (17:24 +0100)]
avformat/img2dec: Use avformat probing interface to identify format if it has not been otherwise identified

This is used only for distinguishing .pix formats for now.
Which is the only case that has image2 demuxers currently

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: add image2 brender pix demuxer
Michael Niedermayer [Fri, 28 Mar 2014 16:24:10 +0000 (17:24 +0100)]
avformat: add image2 brender pix demuxer

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>