OSDN Git Service
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/flvdec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/ffmdec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/cafdec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/bink: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/avidec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/apetag: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/apc: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/aiffdec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/adxdec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 15:34:46 +0000 (16:34 +0100)]
avformat: add ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/isom: free extradata on failure to read it
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f607d80f661_6965_mov00003.mqv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/mov: check avio_read return in mov_read_dvc1()
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f46d5199ee1_9456_vc1-wmapro.ism
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 24 Dec 2013 23:26:32 +0000 (20:26 -0300)]
matroskadec: Fix bug when parsing realaudio codec parameters
flavor can be 0.
This fixes tract ticket #3214
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 25 Dec 2013 11:39:16 +0000 (12:39 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
error.h: Do not circularly depend on avutil.h
See:
7c2bb79f3b849d12800856379063f99f3b018678
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/ape: free packet on avio_read() failure
Fixes memleak
Fixes: msan_uninit-mem_7fcc198b365b_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Dec 2013 02:25:25 +0000 (03:25 +0100)]
avformat/nut: add minor_version field with version>=4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Dec 2013 02:25:24 +0000 (03:25 +0100)]
avformat/nut: store version in the context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/ape: zero seektable&bittable and warn when they where only partially filled
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fcc198b365b_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/vmdav: return the amount of data that has been unpacked from lz_unpack() (as well as errors)
and setup the bytestream buffer size accordingly
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fdcc513cd45_229_12.vmd
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 13 Dec 2013 17:50:48 +0000 (18:50 +0100)]
error.h: Do not circularly depend on avutil.h
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/eatgv: use av_mallocz() for frame_buffer
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fbf6159587b_2571_ORIGIN.TGV
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
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>
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>
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>
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>
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>
Carl Eugen Hoyos [Mon, 23 Dec 2013 22:41:37 +0000 (23:41 +0100)]
Read pictures in id3v2.2
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>
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>
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>
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>
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.
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.
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>
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>
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>
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>
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>
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>
Peter Ross [Mon, 23 Dec 2013 09:37:13 +0000 (20:37 +1100)]
avformat/riffenc: indent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
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>
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>
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>
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>
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>
Tim Walker [Tue, 17 Dec 2013 15:47:31 +0000 (15:47 +0000)]
lavu: fix typo in 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.
Tim Walker [Sun, 22 Dec 2013 17:07:35 +0000 (17:07 +0000)]
doc: fix a coding style error in the developer documentation.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Justin Ruggles [Fri, 22 Nov 2013 16:05:13 +0000 (11:05 -0500)]
Add a libwebp encoder
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Michael Niedermayer [Fri, 20 Dec 2013 23:50:14 +0000 (00:50 +0100)]
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>