OSDN Git Service
Michael Niedermayer [Sat, 4 Jan 2014 12:13:07 +0000 (13:13 +0100)]
Merge commit '
2ad4ee345a4216aef3999f57dd14c56128d27a13'
* commit '
2ad4ee345a4216aef3999f57dd14c56128d27a13':
arm: Add a missing endfunc macro call
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 3 Jan 2014 09:36:08 +0000 (11:36 +0200)]
arm: Add a missing endfunc macro call
Signed-off-by: Martin Storsjö <martin@martin.st>
Clément Bœsch [Sat, 4 Jan 2014 08:31:40 +0000 (09:31 +0100)]
avfilter/lut3d: fix channel order in Iridas format parsing.
According to http://doc.iridas.com/index.php?title=LUT_Formats
for 3D textures, the data is also RGB, and ordered in such a way
that the red coordinate changes fastest, then the green coordinate,
and finally, the blue coordinate changes slowest:
Fixes Ticket #3236.
Michael Niedermayer [Sat, 4 Jan 2014 03:18:43 +0000 (04:18 +0100)]
avcodec/rv30: put the rpr check back in init with the max vs bits bug fixed
Its usefull to know immediatly if extradata is wrong and not just when later
the decoder tries to use it.
This check was removed by:
a6a2282c25abe43e352010a7c3fbc92994c0bc1c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 03:17:15 +0000 (04:17 +0100)]
avcodec/rv30: check rpr before use against maximum
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 03:16:46 +0000 (04:16 +0100)]
avcodec/rv30: cleanup rpr handling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 03:15:22 +0000 (04:15 +0100)]
avcodec/rv10: cleanup rpr handling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 02:13:54 +0000 (03:13 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: remove disabled bfin asm
Conflicts:
libavcodec/bfin/mpegvideo_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 02:03:02 +0000 (03:03 +0100)]
Merge commit '
a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'
* commit '
a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15':
mpegvideo: move dct_unquantize functions up to avoid forward declarations
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 01:56:29 +0000 (02:56 +0100)]
Merge commit '
aec25b1c4650944d32706bfd40eb02bbd5587303'
* commit '
aec25b1c4650944d32706bfd40eb02bbd5587303':
mpegvideo: split the encoding-only parts of frame_start() into a separate function
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 01:40:32 +0000 (02:40 +0100)]
Merge commit '
b318106fae65149356934fc72feafef3272fd4ea'
* commit '
b318106fae65149356934fc72feafef3272fd4ea':
FATE: add a test for the lavr mixing case fixed in
fc6a3ef40d34ce8443ae57c2452f3f273d7d4891
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 01:34:55 +0000 (02:34 +0100)]
Merge commit '
a8cc88b1a23dc1515f27cfa98af16a273c539091'
* commit '
a8cc88b1a23dc1515f27cfa98af16a273c539091':
tests/Makefile: allow FILTER* to be called with lists of filter names
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 01:29:38 +0000 (02:29 +0100)]
Merge commit '
cc976a75dffa148d655b52604331679ff669e8a2'
* commit '
cc976a75dffa148d655b52604331679ff669e8a2':
audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 01:16:30 +0000 (02:16 +0100)]
Merge commit '
fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'
* commit '
fc6a3ef40d34ce8443ae57c2452f3f273d7d4891':
audio_mix: fix zeroing output channels in certain cases
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 01:11:29 +0000 (02:11 +0100)]
Merge commit '
3d95d27376e59de14f984e7a22a52e066d85df35'
* commit '
3d95d27376e59de14f984e7a22a52e066d85df35':
audio_mix: initialize the data pointers to NULL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 01:05:08 +0000 (02:05 +0100)]
Merge commit '
58312b2472d3a44d7458865c459d59ef2e02bf1a'
* commit '
58312b2472d3a44d7458865c459d59ef2e02bf1a':
h264: reset data_partitioning if decoding the slice header for NAL_DPA fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 00:43:01 +0000 (01:43 +0100)]
Merge commit '
e89aa4bf56e5b5c45f569eb12733519789e057da'
* commit '
e89aa4bf56e5b5c45f569eb12733519789e057da':
lzw: switch to bytestream2
Conflicts:
libavcodec/lzw.c
See:
44c4170c52c10e3da3a7ea8e3435ef37c4edc2cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 00:35:17 +0000 (01:35 +0100)]
Merge commit '
1b5d065ca722eb8028c7a08e054b6da3419faf5d'
* commit '
1b5d065ca722eb8028c7a08e054b6da3419faf5d':
pmpdec: check that there is at least one audio packet.
Conflicts:
libavformat/pmpdec.c
See:
8b1cd25ca7e64e6128fa2902d78e48bfeeec9786
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 00:18:33 +0000 (01:18 +0100)]
Merge commit '
94a417acc05cc5151b473abc0bf51fad26f8c5a0'
* commit '
94a417acc05cc5151b473abc0bf51fad26f8c5a0':
mathematics: remove asserts from av_rescale_rnd()
Conflicts:
libavutil/mathematics.c
The asserts are left in place for now as no code checks the return
value, but we sure can change this if application developers
prefer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Jan 2014 00:05:52 +0000 (01:05 +0100)]
Merge commit '
24057c83207d6ea8bfd824155ac37be8a33dfd0c'
* commit '
24057c83207d6ea8bfd824155ac37be8a33dfd0c':
eacmv: check the framerate before setting it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 Jan 2014 23:50:19 +0000 (00:50 +0100)]
Merge commit '
5569146d48f06564e8fa393424782cceed510916'
* commit '
5569146d48f06564e8fa393424782cceed510916':
adx: check that the offset is not negative
See:
30bce34b6719ca99ad72c62e2fba3eade71f1eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 Jan 2014 23:34:52 +0000 (00:34 +0100)]
Merge commit '
a6a2282c25abe43e352010a7c3fbc92994c0bc1c'
* commit '
a6a2282c25abe43e352010a7c3fbc92994c0bc1c':
rv30: fix extradata size check.
Conflicts:
libavcodec/rv30.c
See:
09c5f990bc7629dfbee8c760fd485936c60a7b40
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 Jan 2014 23:16:08 +0000 (00:16 +0100)]
Merge commit '
feded990e3ef9af4a0b827d5b6d8fe86f0b94942'
* commit '
feded990e3ef9af4a0b827d5b6d8fe86f0b94942':
mpegvideo: set reference/pict_type on generated reference frames
Conflicts:
libavcodec/mpegvideo.c
The picture type is left at P type as it was explicitly set before
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 Jan 2014 22:27:28 +0000 (23:27 +0100)]
avformat/utils: fix order of buffers in timestamp update code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 Jan 2014 19:20:12 +0000 (20:20 +0100)]
avcodec/mpegvideo: fix ac/dc_val and coded_block table sizes
With interlaced vc1 it was possible that accesses could happen outside these
tables before this.
Regression since
017e234c204f8ffb5f85a073231247881be1ac6f
Reproduced with a sample from Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Fixes (again) : 480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.SIGFPE.bfa.390.wmv
No releases are affected by this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 Jan 2014 15:54:06 +0000 (16:54 +0100)]
avutil/mathematics: fix 2 typos in the doxy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 3 Jan 2014 12:38:49 +0000 (13:38 +0100)]
doc/faq: remove "-profile option fails when encoding H.264 video with AAC audio" entry
The error was fixed in commit
ce9bd303794fcc94aa232c116bece13c5994b55b
more than one year ago, and does not affect all the currently supported
versions.
In particular, fix trac issue #1535.
Stefano Sabatini [Fri, 3 Jan 2014 12:10:51 +0000 (13:10 +0100)]
doc/ffserver: mention how to access streams through RTSP
Anton Khirnov [Tue, 3 Dec 2013 07:07:24 +0000 (08:07 +0100)]
mpegvideo: remove disabled bfin asm
It has been disabled as 'broken' over 3 years ago in
b716a792
Anton Khirnov [Tue, 3 Dec 2013 06:52:33 +0000 (07:52 +0100)]
mpegvideo: move dct_unquantize functions up to avoid forward declarations
Anton Khirnov [Tue, 3 Dec 2013 06:48:09 +0000 (07:48 +0100)]
mpegvideo: split the encoding-only parts of frame_start() into a separate function
This introduces some code duplication. However, much of it should go
away once the decoders stop using MpegEncContext.
Anton Khirnov [Mon, 16 Dec 2013 20:30:39 +0000 (21:30 +0100)]
FATE: add a test for the lavr mixing case fixed in
fc6a3ef40d34ce8443ae57c2452f3f273d7d4891
Anton Khirnov [Mon, 16 Dec 2013 21:21:01 +0000 (22:21 +0100)]
tests/Makefile: allow FILTER* to be called with lists of filter names
Anton Khirnov [Mon, 16 Dec 2013 18:05:45 +0000 (19:05 +0100)]
audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing
Anton Khirnov [Mon, 16 Dec 2013 17:44:15 +0000 (18:44 +0100)]
audio_mix: fix zeroing output channels in certain cases
Specifically, when the corresponding input channel exists and its matrix
column is all-zero (which is necessary for zeroing the output), the
matrix column must be removed from the matrix.
This is not done currently, so the mixing code would end up using
uninitialized pointers from stack.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Anton Khirnov [Mon, 16 Dec 2013 17:20:41 +0000 (18:20 +0100)]
audio_mix: initialize the data pointers to NULL
This should make it easier to catch problems where some of those
pointers are used uninitialized, since reading from NULL should always
crash, while random numbers from stack can turn out to be valid
pointers, so random memory may be silently overwritten.
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset data_partitioning if decoding the slice header for NAL_DPA fails
If it was set before then we can end up trying to decode a slice without
a valid slice header, which can lead to invalid memory access.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
lzw: switch to bytestream2
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
pmpdec: check that there is at least one audio packet.
The code cannot handle there being none, but that should not happen for
valid files.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 12 Dec 2013 06:34:13 +0000 (07:34 +0100)]
mathematics: remove asserts from av_rescale_rnd()
It is a public function, it must not assert on its parameters.
Anton Khirnov [Thu, 12 Dec 2013 06:31:26 +0000 (07:31 +0100)]
eacmv: check the framerate before setting it.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
adx: check that the offset is not negative
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
rv30: fix extradata size check.
It has been checking the number of bits in the offset instead of the
actual offset.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
mpegvideo: set reference/pict_type on generated reference frames
Otherwise the generic code will unref them, which can then result in
last_picture_ptr == current_picture_ptr, which causes deadlocks at least
in rv40.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Michael Niedermayer [Fri, 3 Jan 2014 14:11:38 +0000 (15:11 +0100)]
avcodec/avcodec: document that some video decoders do not support linesizes changing between frames.
Omission in the documentation found by: Sebastian Dröge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Fri, 3 Jan 2014 11:18:36 +0000 (22:18 +1100)]
avformat/bink: display audio track ids
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anssi Hannula [Fri, 3 Jan 2014 12:55:52 +0000 (14:55 +0200)]
MAINTAINERS: add myself for spdif* and hls.c
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Fri, 27 Dec 2013 11:01:10 +0000 (13:01 +0200)]
avformat/hls: decouple playlists from variants
Not all "sub-playlists" are variant playlists (containing the same
content with a different bitrate, etc) in the current version of the HLS
specification. They can now also be alternative renditions, containing
e.g. alternative audio tracks etc.
Decouple playlists from variants to prepare for handling the new
features.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Mon, 30 Dec 2013 10:46:32 +0000 (12:46 +0200)]
avformat/http: always allow no-op seek
This also allows checking stream position as per ffurl_seek() doxy.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Peter Ross [Fri, 3 Jan 2014 10:31:11 +0000 (21:31 +1100)]
avformat/bink: seek to first frame
Some rare bink files include unused bytes between the frame table index
and first frame data.
Fixes ticket #3266.
This patch has also been tested with non-seekable protocols.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 24 Nov 2013 08:31:48 +0000 (05:31 -0300)]
matroskadec: Export the MuxingApp element value as metadata
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 Jan 2014 01:16:35 +0000 (02:16 +0100)]
ffmpeg: do not fail when options are routed to libavformat and libavcodec and only one can be used
Fixes setting frame_size for pulse demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dale Curtis [Thu, 2 Jan 2014 22:29:38 +0000 (14:29 -0800)]
h264: Clear ERContext.cur_pic when unref'ing current picture.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Michael Niedermayer [Thu, 2 Jan 2014 18:10:57 +0000 (19:10 +0100)]
avcodec/mace: check buffer size
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9d2775e090_8782_surge-2-8-MAC3.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 Jan 2014 17:45:36 +0000 (18:45 +0100)]
mp3on4: fail when the header check fails
It seems the code assumed that when one out of multiple blocks fail
some span of time is correct, its not, its some channels
that are correct
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f44a03ba3ce_5692_id5_1.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 Jan 2014 16:46:21 +0000 (17:46 +0100)]
avcodec/aacps: fix number of bands used with ipd/opd
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f861d16355f_1664_File1_fixed.aac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 Jan 2014 13:50:48 +0000 (14:50 +0100)]
avcodec/iff: ensure that runs with insufficient input dont leave uninitialized bytes in the output
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fa0dea15eae_8988_test.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Thu, 2 Jan 2014 08:34:45 +0000 (19:34 +1100)]
avformat/bink: recognize bink2 files
Support demuxing of audio streams in bink2 files.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 2 Jan 2014 08:32:37 +0000 (09:32 +0100)]
doc/muxers/hls: change "can used" to "can be used"
Spotted-by: Alexander Strasser <eclipse7@gmx.net>
James Almer [Tue, 31 Dec 2013 08:07:03 +0000 (05:07 -0300)]
fate: Add OggVP8 demux test
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Maxim Poliakovski [Wed, 1 Jan 2014 22:25:15 +0000 (23:25 +0100)]
atrac3plus: Add forgotten initialization of an internal struct
This patch also fixes trac ticket 3254.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 27 Dec 2013 12:24:48 +0000 (13:24 +0100)]
doc/doxy: remove unused files
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 Jan 2014 00:53:31 +0000 (01:53 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Makefile: add html template files to the doxygen deps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 1 Jan 2014 23:33:01 +0000 (00:33 +0100)]
doc/muxers/segment: clarify ambiguos reference
Replace "The segmenter muxer" with "This muxer". The "segmenter muxer"
was never defined before, and thus it is a slightly ambiguous term.
Stefano Sabatini [Wed, 1 Jan 2014 23:31:49 +0000 (00:31 +0100)]
doc/muxers/segment: reference hls muxer
Stefano Sabatini [Wed, 1 Jan 2014 23:30:37 +0000 (00:30 +0100)]
doc/muxers/hls: extend documentation
In particular, reference segment muxer and clarify difference between
segment filename number and playlist sequence number.
Should fix trac ticket #2601.
Michael Niedermayer [Wed, 1 Jan 2014 21:29:06 +0000 (22:29 +0100)]
avformat/mux: fix "no tag found" check in validate_codec_tag()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 Jan 2014 14:29:20 +0000 (15:29 +0100)]
avformat/vqf: check avio_read()s return value more completely
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f180a523a71_5052_esvorbei_extd.vqf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 Jan 2014 14:29:20 +0000 (15:29 +0100)]
avcodec/vqavideo: use av_mallocz() for decode_buffer()
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f62eaba897d_595_4D6EFA92.VQA
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 16 Dec 2013 08:30:17 +0000 (09:30 +0100)]
Makefile: add html template files to the doxygen deps
Stefano Sabatini [Wed, 1 Jan 2014 12:04:07 +0000 (13:04 +0100)]
configure: bump year number 2013 -> 2014
Happy new year!
Stefano Sabatini [Sun, 29 Dec 2013 15:43:48 +0000 (16:43 +0100)]
doc/protocols/rtsp, lavf/rtsp: fix/extend options documentation
Werner Robitza [Sun, 29 Dec 2013 17:42:56 +0000 (18:42 +0100)]
ffplay: add documentation for "s" key
With various edits suggested by Stefano Sabatini and Clément Bœsch.
Michael Niedermayer [Wed, 1 Jan 2014 02:30:16 +0000 (03:30 +0100)]
avcodec/binkaudio: clear padding area of packet_buffer
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f0dba198b34_2970_Snd0a3a2ad4.dee
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:53 +0000 (21:12 +0100)]
dxva2_vc1: signal skipped p frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:52 +0000 (21:12 +0100)]
dxva2_vc1: fix signaling of intensity compensation values
lumscale/lumshift don't get reset back to their default values if
intensity compensation is not active, and a wrong signaling here can
cause playback issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:51 +0000 (21:12 +0100)]
vc1: set chromaformat = 1 for simple/main profile
1 is the only valid value for VC-1/WMV3, and setting it here makes sure
no invalid value is send to a hw accelerator, for example.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:50 +0000 (21:12 +0100)]
dxva2_vc1: set PQUANT as described by the 2010 spec update
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:49 +0000 (21:12 +0100)]
dxva2_vc1: set bfraction in slice info according to spec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:48 +0000 (21:12 +0100)]
dxva2_vc1: set refdist value according to spec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Dec 2013 13:09:58 +0000 (14:09 +0100)]
avcodec/mpegvideo_enc: implement frame skip score normalization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 31 Dec 2013 14:18:47 +0000 (15:18 +0100)]
avcodec/hevc: clear HEVClc when its deallocated in hevc_decode_free()
Fixes reading freed memory
Fixes: asan_heap-uaf_1abf8ef_3987_NUT_A_ericsson_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 31 Dec 2013 13:16:27 +0000 (14:16 +0100)]
avformat/version: bump micro for addition of internal field to AVStream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 31 Dec 2013 07:36:14 +0000 (08:36 +0100)]
avformat: dont run update_initial_duration() twice
This should avoid floods of first_dts not matching debug messages
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Mon, 30 Dec 2013 11:10:35 +0000 (12:10 +0100)]
Avoid using empty macro arguments.
These are not supported by all compilers (gcc 2.95 but also older SPARC
compilers, see gcc bug #33304 for example), and there is no real need for them.
One use of this feature remains in libavdevice/v4l2.c which can't be
replaced quite as easily.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Anssi Hannula [Mon, 30 Dec 2013 08:02:59 +0000 (10:02 +0200)]
avformat/id3v2: allow ID3 parsing without AVFormatContext
Add ff_id3v2_read_dict() for parsing without AVFormatContext, but
instead with AVIOContext and AVDictionary.
AVFormatContext is still used for logging, if available.
Chapter parsing is the only non-logging functionality that actually
needs AVFormatContext, and AFAICS it should be modified to write the
data to ID3v2ExtraMeta first, from where it can be implanted to
AVFormatContext by a separate function (like it is done with
read_apic() and ff_id3v2_parse_apic()). That is outside the scope of
this patch, though.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Sat, 28 Dec 2013 07:41:24 +0000 (09:41 +0200)]
avformat/http: allow the caller to select a request range
Add AVOptions for setting the initial offset and the ending offset, so
they can be used for setting an appropriate Range header.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Mon, 30 Dec 2013 08:09:17 +0000 (10:09 +0200)]
avformat/id3v2: parse ID3 Private frames as extra metadata
They are used in HLS.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Anssi Hannula [Mon, 30 Dec 2013 07:50:46 +0000 (09:50 +0200)]
avformat/mpegts: demux timed ID3 metadata
Used in some HLS streams ("Timed Metadata for HTTP Live Streaming").
This is just ID3 tags at arbitrary stream positions, but I still added
"timed" to the codec name to avoid confusion with regular non-stream ID3
tags.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Michael Niedermayer [Mon, 30 Dec 2013 13:27:04 +0000 (14:27 +0100)]
avcodec/lagarith: check and propagate return value from init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 30 Dec 2013 12:49:49 +0000 (13:49 +0100)]
avcodec/lagarith: use init_get_bits8()
Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 30 Dec 2013 12:47:34 +0000 (13:47 +0100)]
avcodec/lagarith: reenable buggy lag_decode_zero_run_line()
This is to prevent regressions in case the old code was able to partly
decode frames (no way to say without a testcase)
Add a memset to prevent use of uninitialized memory until we have a
testcase and can test/fix it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 30 Dec 2013 12:29:47 +0000 (13:29 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc/mjpegenc: use proper error codes.
lavc/mjpegenc: check av_frame_alloc() failure.
lavc/libopenjpegenc: check av_frame_alloc() failure.
lavc/diracdec: check av_frame_alloc() failure.
lavc/utils: check av_frame_alloc() failure.
ffprobe: check av_frame_alloc() failure.
lavc/ffwavesynth: fix dependency sizeof(AVFrame).
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 29 Dec 2013 23:52:48 +0000 (00:52 +0100)]
af_aresample: remove only use of array compound literals with non-const initializers in FFmpeg.
Some older compilers might have particular trouble with them,
and they do not really seem worth it to me.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sun, 29 Dec 2013 23:47:12 +0000 (00:47 +0100)]
configure: check that pthreads is compatible with compiler.
In particular the mutex initialization for example won't actually
compile with e.g. gcc 2.95.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Mon, 30 Dec 2013 11:14:06 +0000 (12:14 +0100)]
compat: provide va_copy for old gcc versions.
Since we have this compat/va_copy.h header already we might just as well make
use of it for more than one compiler.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Mon, 30 Dec 2013 10:23:32 +0000 (11:23 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavu: Move preprocessor macros in a separate file
Conflicts:
libavutil/avutil.h
libavutil/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 29 Dec 2013 09:54:32 +0000 (10:54 +0100)]
lavc/mjpegenc: use proper error codes.
Nicolas George [Sun, 29 Dec 2013 09:52:19 +0000 (10:52 +0100)]
lavc/mjpegenc: check av_frame_alloc() failure.
Nicolas George [Sun, 29 Dec 2013 09:50:24 +0000 (10:50 +0100)]
lavc/libopenjpegenc: check av_frame_alloc() failure.