ffmpeg.git
6 years agoswscale/utils: fix wrong deprecated message with rgb0
Michael Niedermayer [Tue, 24 Dec 2013 21:47:49 +0000 (22:47 +0100)]
swscale/utils: fix wrong deprecated message with rgb0

Fixes Ticket3242
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAllow stream-copying grayscale mov files.
Carl Eugen Hoyos [Thu, 12 Dec 2013 12:47:44 +0000 (13:47 +0100)]
Allow stream-copying grayscale mov files.

This reverts 0de2157f / r12272.
Fixes ticket #3215.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: Do not compute a grayscale palette for cinepak in mov.
Carl Eugen Hoyos [Thu, 12 Dec 2013 12:42:10 +0000 (13:42 +0100)]
avformat/mov: Do not compute a grayscale palette for cinepak in mov.

This was never done for avi files, the decoder always produced
output no matter if a palette was computed or not.
Since a non-standard palette was needed, this simplifies the code.
See issue 1067 and ticket #165.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskadec: Fix start_time
Alex Sukhanov [Mon, 23 Dec 2013 09:41:35 +0000 (01:41 -0800)]
avformat/matroskadec: Fix start_time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: fix crash if segmentation=1, keyframe/intraonly=1 and updatemap=0.
Ronald S. Bultje [Tue, 24 Dec 2013 02:40:13 +0000 (21:40 -0500)]
vp9: fix crash if segmentation=1, keyframe/intraonly=1 and updatemap=0.

The reference map is never used in such cases, but we accidently copied
it anyway. This could cause crashes if this map has not yet been
allocated. Fixes trac ticket 3188.

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: fix bug in updating of coef probabilities with parallelmode=1.
Ronald S. Bultje [Tue, 24 Dec 2013 02:41:35 +0000 (21:41 -0500)]
vp9: fix bug in updating of coef probabilities with parallelmode=1.

Fixes trac ticket 3228.

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libopusdec: Set codec->delay to pre_skip not fixed value
Jan Gerber [Fri, 20 Dec 2013 06:10:41 +0000 (11:40 +0530)]
avcodec/libopusdec: Set codec->delay to pre_skip not fixed value

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRead pictures in id3v2.2
Carl Eugen Hoyos [Mon, 23 Dec 2013 22:41:37 +0000 (23:41 +0100)]
Read pictures in id3v2.2

6 years agoavcodec/wavpack fix *void pointer arithmetic
Michael Niedermayer [Mon, 23 Dec 2013 22:06:10 +0000 (23:06 +0100)]
avcodec/wavpack fix *void pointer arithmetic

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvenc: output ff_format_none if ff_put_wav_header fails
Peter Ross [Mon, 23 Dec 2013 09:39:50 +0000 (20:39 +1100)]
wtvenc: output ff_format_none if ff_put_wav_header fails

This occurs when muxing E-AC-3.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvenc: use codec tag + MEDIASUBTYPE_BASE_GUID, if there is no suitable guid
Peter Ross [Mon, 23 Dec 2013 09:39:31 +0000 (20:39 +1100)]
wtvenc: use codec tag + MEDIASUBTYPE_BASE_GUID, if there is no suitable guid

This permits H264, AAC, AAC-LATM muxing.

Fixes ticket #536.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtv: make ff_format_videoinfo2 visible to wtv encoder
Peter Ross [Mon, 23 Dec 2013 09:39:13 +0000 (20:39 +1100)]
wtv: make ff_format_videoinfo2 visible to wtv encoder

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/zmqsend: rename ctx to zmq_ctx
Stefano Sabatini [Mon, 23 Dec 2013 17:43:55 +0000 (18:43 +0100)]
tools/zmqsend: rename ctx to zmq_ctx

The new name is more explicit.

6 years agotools/zmqsend: use valid NULL log context
Stefano Sabatini [Mon, 23 Dec 2013 17:41:58 +0000 (18:41 +0100)]
tools/zmqsend: use valid NULL log context

The zmq context is not a valid log context. Fix crash.

6 years agoavcodec/apedec: use av_fast_padded_malloc()
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/apedec: use av_fast_padded_malloc()

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7fa0d8c8bd58_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/apedec: more checks for k
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/apedec: more checks for k

Fixes assertion failure
Fixes part of msan_uninit-mem_7fa0d8c8bd58_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libopencore-amr: remove av_free coded_frame.
Michael Niedermayer [Mon, 23 Dec 2013 16:38:39 +0000 (17:38 +0100)]
avcodec/libopencore-amr: remove av_free coded_frame.

There seems to be nothing that sets coded_frame
also av_free is wrong

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: drop 2.0 from the releases that i maintain
Michael Niedermayer [Mon, 23 Dec 2013 16:24:12 +0000 (17:24 +0100)]
MAINTAINERS: drop 2.0 from the releases that i maintain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/iss: check sscanf() return code
Michael Niedermayer [Sun, 22 Dec 2013 23:17:52 +0000 (00:17 +0100)]
avformat/iss: check sscanf() return code

Fixes use of uninitialized data
Fixes: msan_uninit-mem_7f883205ce82_15_0001010100.iss
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvenc: populate VIDEOINFOHEADER2
Peter Ross [Mon, 23 Dec 2013 09:37:28 +0000 (20:37 +1100)]
wtvenc: populate VIDEOINFOHEADER2

Fixes ticket #2835.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/riffenc: indent
Peter Ross [Mon, 23 Dec 2013 09:37:13 +0000 (20:37 +1100)]
avformat/riffenc: indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoriffenc: add option to ff_put_bmp_header to ignore extradata
Peter Ross [Mon, 23 Dec 2013 09:37:00 +0000 (20:37 +1100)]
riffenc: add option to ff_put_bmp_header to ignore extradata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvenc: test avio_size() validity
Peter Ross [Mon, 23 Dec 2013 10:04:45 +0000 (21:04 +1100)]
wtvenc: test avio_size() validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 23 Dec 2013 12:04:02 +0000 (13:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavu: fix typo in documentation.

See: e53061154f42cda93052a2f558e1c4697e3b0c1a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'
Michael Niedermayer [Mon, 23 Dec 2013 11:52:30 +0000 (12:52 +0100)]
Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'

* commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e':
  doc: fix link to the ISC license text in the developer documentation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877'
Michael Niedermayer [Mon, 23 Dec 2013 10:58:14 +0000 (11:58 +0100)]
Merge commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877'

* commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877':
  doc: fix a coding style error in the developer documentation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: fix memleak on avcodec_open2() failure
Michael Niedermayer [Mon, 23 Dec 2013 00:53:05 +0000 (01:53 +0100)]
avcodec/utils: fix memleak on avcodec_open2() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/wavpack: clear remainder of data in case of error in wv_unpack_mono/stereo()
Michael Niedermayer [Sun, 22 Dec 2013 23:17:52 +0000 (00:17 +0100)]
avcodec/wavpack: clear remainder of data in case of error in wv_unpack_mono/stereo()

Fixes use of uninitialized data
Fixes: msan_uninit-mem_7fd85b654950_4005_because.wv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: fix typo in documentation.
Tim Walker [Tue, 17 Dec 2013 15:47:31 +0000 (15:47 +0000)]
lavu: fix typo in documentation.

6 years agodoc: fix link to the ISC license text in the developer documentation.
Tim Walker [Sun, 22 Dec 2013 16:52:05 +0000 (16:52 +0000)]
doc: fix link to the ISC license text in the developer documentation.

6 years agodoc: fix a coding style error in the developer documentation.
Tim Walker [Sun, 22 Dec 2013 17:07:35 +0000 (17:07 +0000)]
doc: fix a coding style error in the developer documentation.

6 years agoavutil/avstring: add av_strnlen()
Michael Niedermayer [Sat, 21 Dec 2013 14:42:04 +0000 (15:42 +0100)]
avutil/avstring: add av_strnlen()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoConvert XvMC to hwaccel v3
Ivan Kalvachev [Sat, 14 Dec 2013 19:29:15 +0000 (21:29 +0200)]
Convert XvMC to hwaccel v3

Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 22 Dec 2013 20:39:10 +0000 (21:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: Fix intensity compensation performance regression

Conflicts:
libavcodec/vc1.c

See: ed5bed4152203aed8cce01a679bed67bbda8903f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: support raising major version in soname
Michael Niedermayer [Wed, 18 Dec 2013 04:20:11 +0000 (05:20 +0100)]
configure: support raising major version in soname

this allows seperate installation of shared libs that should not conflict with
whatever is already installed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: use timestamp from before and after the decoder to detect backward moving...
Michael Niedermayer [Sun, 22 Dec 2013 18:42:13 +0000 (19:42 +0100)]
ffmpeg: use timestamp from before and after the decoder to detect backward moving dts for discontinuity detection

This should make discontinuity detection more robust and detect
more cases. Timestamps after the decoder can be delayed due to threads,
timestamps before can be missing

no testcase available/known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard...
Michael Niedermayer [Sun, 22 Dec 2013 17:47:28 +0000 (18:47 +0100)]
nutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard the 2nd

This fixes an assertion failure and regression and restores previous behaviour
Fixes Ticket3197

An alternative would be to fail hard in this case and refuse to mux such data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: Fix intensity compensation performance regression
Mason Carter [Sun, 22 Dec 2013 01:27:18 +0000 (17:27 -0800)]
vc1: Fix intensity compensation performance regression

Introduced by 28243b0d35b47bbf9abbd454fc444a6e0a9e7b71

Intensity compensation is always used once it was encountered, because
v->next_use_ic is never set back to zero.

Reset v->next_use_ic, when resetting v->next_luty/uv.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovc1: simplify *_use_ic initialization
Michael Niedermayer [Sun, 22 Dec 2013 13:37:30 +0000 (14:37 +0100)]
vc1: simplify *_use_ic initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoVC1: Fix intensity compensation performance regression
Mason Carter [Sun, 22 Dec 2013 01:27:18 +0000 (17:27 -0800)]
VC1: Fix intensity compensation performance regression

Fix https://trac.ffmpeg.org/ticket/3204

The problem was that intensity compensation was always used once it was
encountered. This is because v->next_use_ic was never set back to zero.
To fix this, when resetting v->next_luty/uv, also reset v->next_use_ic.

This improved (restored) performance by 85% when decoding
http://bit.ly/bbbwmv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 22 Dec 2013 11:43:43 +0000 (12:43 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hevc: move DSP declarations from hevc.h into hevcdsp.h

Conflicts:
libavcodec/hevc.h
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h

See: c8dd048ab8cff815c9f4b16a62db0b74df011f0a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'
Michael Niedermayer [Sun, 22 Dec 2013 10:53:41 +0000 (11:53 +0100)]
Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'

* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
  Add a libwebp encoder

Conflicts:
Changelog
doc/encoders.texi
doc/general.texi
libavcodec/version.h
libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: move DSP declarations from hevc.h into hevcdsp.h
Guillaume Martres [Fri, 20 Dec 2013 23:08:50 +0000 (00:08 +0100)]
hevc: move DSP declarations from hevc.h into hevcdsp.h

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavformat/4xm: shrink packet if it was only partially initialized
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
avformat/4xm: shrink packet if it was only partially initialized

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f6c76ab7950_4920_dracula.4xm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/isom: check avio_read() result
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
avformat/isom: check avio_read() result

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f7aa4151661_4885_dmbts3.ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rmdec: zero string destination before use
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
avformat/rmdec: zero string destination before use

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9677850d99_4635_crashed.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd a libwebp encoder
Justin Ruggles [Fri, 22 Nov 2013 16:05:13 +0000 (11:05 -0500)]
Add a libwebp encoder

6 years agovcodec/rv34: use av_mallocz() to allocate tables
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
vcodec/rv34: use av_mallocz() to allocate tables

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f75e2a55b88_4146_brokenaudio.rmvb
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/electronicarts: detect endianness by comparing sizes instead of using an...
Michael Niedermayer [Sat, 21 Dec 2013 13:09:45 +0000 (14:09 +0100)]
avformat/electronicarts: detect endianness by comparing sizes instead of using an arbitrary threshold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/gxfenc: dont use a int intermediate to store in a unsigned int table
Michael Niedermayer [Sat, 21 Dec 2013 12:48:15 +0000 (13:48 +0100)]
avformat/gxfenc: dont use a int intermediate to store in a unsigned int table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/electronicarts: use 64bit variable for avio_tell() result
Michael Niedermayer [Sat, 21 Dec 2013 12:48:15 +0000 (13:48 +0100)]
avformat/electronicarts: use 64bit variable for avio_tell() result

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vqavideo: clear uninitialized parts of the decode buffer
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
avcodec/vqavideo: clear uninitialized parts of the decode buffer

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7f841fe2ab3b_4608_cow2_1.vqa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vqavideo: check destination size on all exit pathes
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
avcodec/vqavideo: check destination size on all exit pathes

Fixes part of msan_uninit-mem_7f841fe2ab3b_4608_cow2_1.vqa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/muxing: fix memleaks in resampler
Ilya Basin [Mon, 16 Dec 2013 09:08:34 +0000 (13:08 +0400)]
examples/muxing: fix memleaks in resampler

  - do not allocate resample dst buffer when resample is off
  - free sample buffers in addition to freeing data pointer arrays

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/muxing: use S16 sample_fmt for resample src regardless of codec sample_fmt
Ilya Basin [Mon, 16 Dec 2013 09:08:03 +0000 (13:08 +0400)]
examples/muxing: use S16 sample_fmt for resample src regardless of codec sample_fmt

We generate S16 samples and we should allocate the right buffer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/muxing: fix av_frame_free() not called when got_packet is false
Ilya Basin [Mon, 16 Dec 2013 09:05:51 +0000 (13:05 +0400)]
examples/muxing: fix av_frame_free() not called when got_packet is false

Hi list! Since my last patch (fix 2 memleaks in doc/examples/muxing.c)
I found more problems to fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvdec: when testing for truncated files, actually check the .wtv file size
Peter Ross [Sat, 21 Dec 2013 08:42:23 +0000 (19:42 +1100)]
wtvdec: when testing for truncated files, actually check the .wtv file size

Previously the demuxer was testing against avio_tell, and this would generate
many false warnings.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 21 Dec 2013 00:19:38 +0000 (01:19 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Don't clobber callee saved registers in scalarproduct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72'
Michael Niedermayer [Sat, 21 Dec 2013 00:02:14 +0000 (01:02 +0100)]
Merge commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72'

* commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72':
  hevc: support luma bit depth != chroma bit depth for PCM coding units

Conflicts:
libavcodec/hevc.c

See: 0afa254d4efd3c06fd0194789aefc193c8506947
See: a7e300649a7a2105a4f7edfaf936f0a9e05a2d43
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '78d0b7f36e39bb4745613e312024ddd508e2f0fb'
Michael Niedermayer [Fri, 20 Dec 2013 23:52:49 +0000 (00:52 +0100)]
Merge commit '78d0b7f36e39bb4745613e312024ddd508e2f0fb'

* commit '78d0b7f36e39bb4745613e312024ddd508e2f0fb':
  hevc: warn when an unknown profile is used

See: a21839149cddf2fa6d4cfc37d066cdb68a2ac8aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '259cddb137988a25607f091c2414158ff81ca7d6'
Michael Niedermayer [Fri, 20 Dec 2013 23:50:14 +0000 (00:50 +0100)]
Merge commit '259cddb137988a25607f091c2414158ff81ca7d6'

* commit '259cddb137988a25607f091c2414158ff81ca7d6':
  hevc_ps: fix indentation

See: 36658c978f5d7df2ce556075946f3a80f7eca753
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8'
Michael Niedermayer [Fri, 20 Dec 2013 23:39:11 +0000 (00:39 +0100)]
Merge commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8'

* commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8':
  hevc: refactor Profile Tier Level
  hevc: don't check for errors in PTL code

Conflicts:
libavcodec/hevc_ps.c

See: 36658c978f5d7df2ce556075946f3a80f7eca753
See: dddc9b7a8ec3a03e48c69991ca7f20f10dd6f022
See: ecb21d24373ccf8f1d090cff48f4e0c384b7f998
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '321cb8b048c7a8c0d2950f9278f36d912a886fa0'
Michael Niedermayer [Fri, 20 Dec 2013 23:30:31 +0000 (00:30 +0100)]
Merge commit '321cb8b048c7a8c0d2950f9278f36d912a886fa0'

* commit '321cb8b048c7a8c0d2950f9278f36d912a886fa0':
  hevc: store profile and level in AVCodecContext

See: fb7d70c1cd95529cbbbeeab5e9fa3b200ef2545c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2a41826bea3833895dc06939831b7f35ca1f597e'
Michael Niedermayer [Fri, 20 Dec 2013 23:22:14 +0000 (00:22 +0100)]
Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e'

* commit '2a41826bea3833895dc06939831b7f35ca1f597e':
  lavc: add HEVC profiles names

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

See: fb7d70c1cd95529cbbbeeab5e9fa3b200ef2545c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30'
Michael Niedermayer [Fri, 20 Dec 2013 23:11:59 +0000 (00:11 +0100)]
Merge commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30'

* commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30':
  flv: Use the correct type to hold the file offset

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2'
Michael Niedermayer [Fri, 20 Dec 2013 23:04:19 +0000 (00:04 +0100)]
Merge commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2'

* commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2':
  jvdec: Do not feed the decoder with known wrong data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'
Michael Niedermayer [Fri, 20 Dec 2013 22:56:43 +0000 (23:56 +0100)]
Merge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'

* commit 'e518cb863edc931888ccca6cad86f73ca7430cef':
  jvdec: Fix memory leak of jv->frames

See: 596814f9781772050c65bdd8add27445bc8374a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '027712e851da4d124a842c9e2802f95d50582553'
Michael Niedermayer [Fri, 20 Dec 2013 22:49:56 +0000 (23:49 +0100)]
Merge commit '027712e851da4d124a842c9e2802f95d50582553'

* commit '027712e851da4d124a842c9e2802f95d50582553':
  jvdec: Return EOF on end of file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'dfc50ac85e9d68a771b556297b7c411650206f3b'
Michael Niedermayer [Fri, 20 Dec 2013 22:44:31 +0000 (23:44 +0100)]
Merge commit 'dfc50ac85e9d68a771b556297b7c411650206f3b'

* commit 'dfc50ac85e9d68a771b556297b7c411650206f3b':
  x86: mpegvideo: move denoise_dct asm to mpegvideoenc

Conflicts:
libavcodec/x86/mpegvideo.c
libavcodec/x86/mpegvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4'
Michael Niedermayer [Fri, 20 Dec 2013 22:33:10 +0000 (23:33 +0100)]
Merge commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4'

* commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4':
  vc1: arm: Add NEON no_rnd chroma MC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '832e19063209a5f355af733d1a45f5051f49ce33'
Michael Niedermayer [Fri, 20 Dec 2013 22:11:29 +0000 (23:11 +0100)]
Merge commit '832e19063209a5f355af733d1a45f5051f49ce33'

* commit '832e19063209a5f355af733d1a45f5051f49ce33':
  vc1: arm: Add NEON assembly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/pva: Make sure the header is large enough before reading the timestamp from it
Michael Niedermayer [Fri, 20 Dec 2013 17:07:30 +0000 (18:07 +0100)]
avformat/pva: Make sure the header is large enough before reading the timestamp from it

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f34b5dc6d58_2674_PVA_test-partial.pva
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/pva: Make sure the first byte of pes_header_data has been initialized
Michael Niedermayer [Fri, 20 Dec 2013 17:07:30 +0000 (18:07 +0100)]
avformat/pva: Make sure the first byte of pes_header_data has been initialized

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f53c1d0e95c_2674_PVA_test-partial.pva
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoarm: Don't clobber callee saved registers in scalarproduct
Martin Storsjö [Fri, 20 Dec 2013 13:02:35 +0000 (15:02 +0200)]
arm: Don't clobber callee saved registers in scalarproduct

q4-q7/d8-d15 are supposed to not be clobbered by the callee.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agohevc: support luma bit depth != chroma bit depth for PCM coding units
Mickaël Raulet [Sat, 14 Dec 2013 14:50:32 +0000 (15:50 +0100)]
hevc: support luma bit depth != chroma bit depth for PCM coding units

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agohevc: warn when an unknown profile is used
Guillaume Martres [Sat, 14 Dec 2013 14:50:31 +0000 (15:50 +0100)]
hevc: warn when an unknown profile is used

Bitstreams conforming to the spec should not use profiles not defined
in it.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agohevc_ps: fix indentation
Gildas Cocherel [Fri, 20 Dec 2013 18:39:10 +0000 (19:39 +0100)]
hevc_ps: fix indentation

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agohevc: refactor Profile Tier Level
Gildas Cocherel [Wed, 18 Dec 2013 23:36:45 +0000 (00:36 +0100)]
hevc: refactor Profile Tier Level

Also store a few PTL flags which were skipped before

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agohevc: don't check for errors in PTL code
Guillaume Martres [Sat, 14 Dec 2013 14:50:29 +0000 (15:50 +0100)]
hevc: don't check for errors in PTL code

According to the spec, the value of XXX_reserved_zero_44bits should be
ignored, so don't report an error when it's not zero.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agohevc: store profile and level in AVCodecContext
Gildas Cocherel [Sat, 14 Dec 2013 14:50:28 +0000 (15:50 +0100)]
hevc: store profile and level in AVCodecContext

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavc: add HEVC profiles names
Gildas Cocherel [Wed, 18 Dec 2013 23:30:24 +0000 (00:30 +0100)]
lavc: add HEVC profiles names

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavfi/hue: show first decimal value of saturation
Stefano Sabatini [Fri, 20 Dec 2013 18:25:42 +0000 (19:25 +0100)]
lavfi/hue: show first decimal value of saturation

6 years agolavfi/hue: use av_clip_uint8() instead of av_clip_uint8_c()
Stefano Sabatini [Fri, 20 Dec 2013 18:11:35 +0000 (19:11 +0100)]
lavfi/hue: use av_clip_uint8() instead of av_clip_uint8_c()

The generic version should be faster if optimized.

6 years agolavfi/hue: force table initialization for the first frame
Stefano Sabatini [Fri, 20 Dec 2013 18:10:46 +0000 (19:10 +0100)]
lavfi/hue: force table initialization for the first frame

6 years agoavformat/smacker: check for format mismatch more completely
Michael Niedermayer [Fri, 20 Dec 2013 17:07:30 +0000 (18:07 +0100)]
avformat/smacker: check for format mismatch more completely

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f6e83322950_9769_wetlogo.smk
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nistspheredec: initialize header_size to -1
Michael Niedermayer [Fri, 20 Dec 2013 17:07:30 +0000 (18:07 +0100)]
avformat/nistspheredec: initialize header_size to -1

Fixes use of uninitialized memory
This also avoids the need to check the scanf() return as the subsequent check catches it
Fixes: msan_uninit-mem_7f712e4dc173_7414_nist_ulaw.nist
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflv: Use the correct type to hold the file offset
Luca Barbato [Thu, 19 Dec 2013 06:38:15 +0000 (07:38 +0100)]
flv: Use the correct type to hold the file offset

6 years agojvdec: Do not feed the decoder with known wrong data
Luca Barbato [Fri, 13 Dec 2013 02:07:57 +0000 (03:07 +0100)]
jvdec: Do not feed the decoder with known wrong data

Still assume the size value is right in non-explode mode.

6 years agojvdec: Fix memory leak of jv->frames
Paul B Mahol [Tue, 3 Jul 2012 09:51:44 +0000 (09:51 +0000)]
jvdec: Fix memory leak of jv->frames

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agojvdec: Return EOF on end of file
Luca Barbato [Fri, 13 Dec 2013 02:10:16 +0000 (03:10 +0100)]
jvdec: Return EOF on end of file

6 years agox86: mpegvideo: move denoise_dct asm to mpegvideoenc
Anton Khirnov [Fri, 20 Dec 2013 12:00:22 +0000 (13:00 +0100)]
x86: mpegvideo: move denoise_dct asm to mpegvideoenc

This function is encoding-only.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavcodec/mpegvideo_enc: fix frame skipping with intra only codecs
Michael Niedermayer [Fri, 20 Dec 2013 12:50:46 +0000 (13:50 +0100)]
avcodec/mpegvideo_enc: fix frame skipping with intra only codecs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo_enc: fix integer overflow with -skip_exp >= 2
Michael Niedermayer [Fri, 20 Dec 2013 12:35:39 +0000 (13:35 +0100)]
avcodec/mpegvideo_enc: fix integer overflow with -skip_exp >= 2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: arm: Add NEON no_rnd chroma MC
Mason Carter [Sun, 15 Dec 2013 01:32:57 +0000 (17:32 -0800)]
vc1: arm: Add NEON no_rnd chroma MC

Apply David Conrad's old patch to the modern codebase.

http://ffmpeg.org/pipermail/ffmpeg-devel/2009-April/059877.html

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1: arm: Add NEON assembly
Mason Carter [Sun, 15 Dec 2013 01:32:56 +0000 (17:32 -0800)]
vc1: arm: Add NEON assembly

For:

ff_vc1_inv_trans_{8,4}x{8,4}_{dc_,}neon
ff_put_pixels8x8_neon
ff_put_vc1_mspel_mc{0,1,2,3}{0,1,2,3}_neon (except for 00)

Based on ARM assembly code in libavcodec/arm by Rob Clark and Mans
Rullgard.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 20 Dec 2013 12:09:39 +0000 (13:09 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  atomics: cosmetics: Restructure ifdefs for greater clarity

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8558595a59913a4667f57d5a4658b1340f1a4354'
Michael Niedermayer [Fri, 20 Dec 2013 11:48:16 +0000 (12:48 +0100)]
Merge commit '8558595a59913a4667f57d5a4658b1340f1a4354'

* commit '8558595a59913a4667f57d5a4658b1340f1a4354':
  configure: Express atomics/thread deps through the dependency system

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoatomics: cosmetics: Restructure ifdefs for greater clarity
Diego Biurrun [Wed, 18 Dec 2013 21:28:11 +0000 (22:28 +0100)]
atomics: cosmetics: Restructure ifdefs for greater clarity

Also fix the #endif comment in a few places and #include config.h to
avoid assuming it is #included implicitly.

6 years agoavformat/sierravmd: Check avio_read return value
Michael Niedermayer [Thu, 19 Dec 2013 19:48:51 +0000 (20:48 +0100)]
avformat/sierravmd: Check avio_read return value

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f82af392dae_1848_HR060606.VMD
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoremuxing .opus files to .webm codec->delay must be copied too
Jan Gerber [Thu, 19 Dec 2013 14:56:49 +0000 (20:26 +0530)]
remuxing .opus files to .webm codec->delay must be copied too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>