ffmpeg.git
6 years agolavf/oggparseopus: Setting seek_preroll in AVCodecContext
Vignesh Venkatasubramanian [Wed, 5 Feb 2014 15:36:13 +0000 (07:36 -0800)]
lavf/oggparseopus: Setting seek_preroll in AVCodecContext

Setting seek_preroll value in AVCodecContext for Opus streams
embedded in ogg container.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: use real libfdk-aac version instead of API version in help text
Timothy Gu [Wed, 5 Feb 2014 04:01:16 +0000 (20:01 -0800)]
configure: use real libfdk-aac version instead of API version in help text

Also use real name with a '-' instead of '_'.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Wed, 5 Feb 2014 13:12:46 +0000 (14:12 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: flush subtitle codecs as well with null packets
  ffplay: reorder the filters to ensure that inputs of the custom filters are merged first

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/vp9lpf: remove 8 SWAPs in 84/48 transpose.
Clément Bœsch [Wed, 5 Feb 2014 06:21:13 +0000 (07:21 +0100)]
x86/vp9lpf: remove 8 SWAPs in 84/48 transpose.

6 years agox86/vp9lpf: remove braindead double pxor.
Clément Bœsch [Wed, 5 Feb 2014 06:21:11 +0000 (07:21 +0100)]
x86/vp9lpf: remove braindead double pxor.

6 years agox86/vp9lpf: save a few mov in flat8in/hev masks calc.
Clément Bœsch [Wed, 5 Feb 2014 06:21:09 +0000 (07:21 +0100)]
x86/vp9lpf: save a few mov in flat8in/hev masks calc.

6 years agox86/vp9lpf: add ff_vp9_loop_filter_[vh]_44_16_{sse2,ssse3,avx}.
Clément Bœsch [Wed, 5 Feb 2014 06:21:06 +0000 (07:21 +0100)]
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_44_16_{sse2,ssse3,avx}.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 5 Feb 2014 02:59:37 +0000 (03:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9ecb858775483a76c137e8e1ad45a95e318bca61'
Michael Niedermayer [Wed, 5 Feb 2014 02:25:52 +0000 (03:25 +0100)]
Merge commit '9ecb858775483a76c137e8e1ad45a95e318bca61'

* commit '9ecb858775483a76c137e8e1ad45a95e318bca61':
  doxy: Format @code blocks so they render properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'
Michael Niedermayer [Wed, 5 Feb 2014 02:17:16 +0000 (03:17 +0100)]
Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'

* commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931':
  lavf: improve handling of sparse streams when muxing

Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h

See: 37ed5df5c5e06a55724fb9eb215da1594b648282
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'
Michael Niedermayer [Wed, 5 Feb 2014 01:46:45 +0000 (02:46 +0100)]
Merge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'

* commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b':
  lagarith: reallocate rgb_planes when needed

Conflicts:
libavcodec/lagarith.c

See: 9eef41b848939a0a86582afdb45235e41612d9ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2240e2078d53d3cfce8ff1dda64e58fa72038602'
Michael Niedermayer [Wed, 5 Feb 2014 01:16:20 +0000 (02:16 +0100)]
Merge commit '2240e2078d53d3cfce8ff1dda64e58fa72038602'

* commit '2240e2078d53d3cfce8ff1dda64e58fa72038602':
  truemotion1: check the header size

See: e7b43e8e84e48fccf64cdc62430cb8b5c69e804c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1713eec29add37b654ec6bf262b843d139c1ffc6'
Michael Niedermayer [Wed, 5 Feb 2014 00:56:39 +0000 (01:56 +0100)]
Merge commit '1713eec29add37b654ec6bf262b843d139c1ffc6'

* commit '1713eec29add37b654ec6bf262b843d139c1ffc6':
  shorten: pad the internal bitstream buffer

See: 89d998f1c1eddac3a1256e28ac00ccfdf4d3edd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5430839144c6da0160e8e0cfb0c8db01de432e94'
Michael Niedermayer [Wed, 5 Feb 2014 00:42:06 +0000 (01:42 +0100)]
Merge commit '5430839144c6da0160e8e0cfb0c8db01de432e94'

* commit '5430839144c6da0160e8e0cfb0c8db01de432e94':
  eacmv: clear references on frame dimensions change

Conflicts:
libavcodec/eacmv.c

See: e9d443cf08503f7bd0149576ba9e891322de340d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6'
Michael Niedermayer [Wed, 5 Feb 2014 00:30:18 +0000 (01:30 +0100)]
Merge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6'

* commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6':
  samplefmt: avoid integer overflow in av_samples_get_buffer_size()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'
Michael Niedermayer [Wed, 5 Feb 2014 00:27:48 +0000 (01:27 +0100)]
Merge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'

* commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c':
  avcodec: Suppress deprecation warnings from avcodec_alloc_frame()

Conflicts:
libavcodec/utils.c

No change as we dont call this deprecated function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'
Michael Niedermayer [Wed, 5 Feb 2014 00:18:48 +0000 (01:18 +0100)]
Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'

* commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27':
  jvdec: K&R formatting cosmetics

Conflicts:
libavcodec/jvdec.c
libavformat/jvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: flush subtitle codecs as well with null packets
Marton Balint [Wed, 29 Jan 2014 23:55:18 +0000 (00:55 +0100)]
ffplay: flush subtitle codecs as well with null packets

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: reorder the filters to ensure that inputs of the custom filters are merged...
Marton Balint [Wed, 29 Jan 2014 22:00:52 +0000 (23:00 +0100)]
ffplay: reorder the filters to ensure that inputs of the custom filters are merged first

For more info see http://ffmpeg.org/pipermail/ffmpeg-user/2013-December/018761.html

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompeg: K&R formatting cosmetics
Vittorio Giovara [Tue, 4 Feb 2014 13:57:54 +0000 (13:57 +0000)]
mpeg: K&R formatting cosmetics

Also adjust header #include order and some comments.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agodoxy: Format @code blocks so they render properly
Luca Barbato [Mon, 16 Dec 2013 00:39:30 +0000 (01:39 +0100)]
doxy: Format @code blocks so they render properly

@code command reports verbatim everything between it and @endcode.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavf: improve handling of sparse streams when muxing
Luca Barbato [Mon, 20 Jan 2014 12:28:37 +0000 (13:28 +0100)]
lavf: improve handling of sparse streams when muxing

Currently ff_interleave_packet_per_dts() waits until it gets a frame for
each stream before outputting packets in interleaved order.

Sparse streams (i.e. streams with much fewer packets than the other
streams, like subtitles or audio with DTX) tend to add up latency and in
specific cases end up allocating a large amount of memory.

Emit the top packet from the packet_buffer if it has a time delta
larger than a specified threshold.

Original report of the issue and initial proposed solution by
mus.svz@gmail.com.

Bug-id: 31
Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolagarith: reallocate rgb_planes when needed
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
lagarith: reallocate rgb_planes when needed

Fixes invalid writes on pixel format changes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agotruemotion1: check the header size
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
truemotion1: check the header size

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agoshorten: pad the internal bitstream buffer
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
shorten: pad the internal bitstream buffer

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agoeacmv: clear references on frame dimensions change
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
eacmv: clear references on frame dimensions change

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agoavcodec/vc1dec: remove blocks_off use from vc1_pred_b_mv()
Michael Niedermayer [Tue, 4 Feb 2014 19:31:47 +0000 (20:31 +0100)]
avcodec/vc1dec: remove blocks_off use from vc1_pred_b_mv()

it should always be 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vc1dec: vc1_pred_b_mv() is not used for fields, simplify code
Michael Niedermayer [Tue, 4 Feb 2014 19:11:46 +0000 (20:11 +0100)]
avcodec/vc1dec: vc1_pred_b_mv() is not used for fields, simplify code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosamplefmt: avoid integer overflow in av_samples_get_buffer_size()
Justin Ruggles [Thu, 30 Jan 2014 19:08:38 +0000 (14:08 -0500)]
samplefmt: avoid integer overflow in av_samples_get_buffer_size()

CC:libav-stable@libav.org

6 years agoMerge commit '1f097d168d9cad473dd44010a337c1413a9cd198'
Michael Niedermayer [Tue, 4 Feb 2014 15:26:43 +0000 (16:26 +0100)]
Merge commit '1f097d168d9cad473dd44010a337c1413a9cd198'

* commit '1f097d168d9cad473dd44010a337c1413a9cd198':
  h264: reset data partitioning at the beginning of each decode call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'
Michael Niedermayer [Tue, 4 Feb 2014 15:10:24 +0000 (16:10 +0100)]
Merge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'

* commit 'e46ad30a808744ddf3855567e162292a4eaabac7':
  vp8: use a fixed-size edge emu buffer

Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h

See: face578d56c2d1375e40d5e2a28acc122132bc55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: use avformat_alloc_context()
Michael Niedermayer [Tue, 4 Feb 2014 15:01:02 +0000 (16:01 +0100)]
ffserver: use avformat_alloc_context()

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'
Michael Niedermayer [Tue, 4 Feb 2014 14:37:05 +0000 (15:37 +0100)]
Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'

* commit '33c859c142ef3f49b7a6227014ad92a680cf4d74':
  lavf: ignore attachment streams for interleaving purposes

Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6'
Michael Niedermayer [Tue, 4 Feb 2014 14:17:19 +0000 (15:17 +0100)]
Merge commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6'

* commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6':
  lavf: do basic sanity checking on muxed packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5de64bb34d68d6c224dca90003172d7a27958825'
Michael Niedermayer [Tue, 4 Feb 2014 14:08:29 +0000 (15:08 +0100)]
Merge commit '5de64bb34d68d6c224dca90003172d7a27958825'

* commit '5de64bb34d68d6c224dca90003172d7a27958825':
  utvideoenc: Add support for the new BT.709 FourCCs for YCbCr

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/dualinput: fix repeatlast to match docs and eof_action=pass
Michael Niedermayer [Tue, 4 Feb 2014 13:54:14 +0000 (14:54 +0100)]
avfilter/dualinput: fix repeatlast to match docs and eof_action=pass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'de203abd71baae7f120313259b45cf935c85203e'
Michael Niedermayer [Tue, 4 Feb 2014 13:33:33 +0000 (14:33 +0100)]
Merge commit 'de203abd71baae7f120313259b45cf935c85203e'

* commit 'de203abd71baae7f120313259b45cf935c85203e':
  vf_overlay: add eof_action switch

Conflicts:
doc/filters.texi
libavfilter/vf_overlay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: Suppress deprecation warnings from avcodec_alloc_frame()
Diego Biurrun [Tue, 4 Feb 2014 11:23:15 +0000 (03:23 -0800)]
avcodec: Suppress deprecation warnings from avcodec_alloc_frame()

The function is itself obsolete and slated for removal.

6 years agoMerge commit 'b25e84b7399bd91605596b67d761d3464dbe8a6e'
Michael Niedermayer [Tue, 4 Feb 2014 12:44:26 +0000 (13:44 +0100)]
Merge commit 'b25e84b7399bd91605596b67d761d3464dbe8a6e'

* commit 'b25e84b7399bd91605596b67d761d3464dbe8a6e':
  hevc: check that the VCL NAL types are the same for all slice segments of a frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojvdec: K&R formatting cosmetics
Vittorio Giovara [Fri, 13 Dec 2013 13:30:22 +0000 (14:30 +0100)]
jvdec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoh264: reset data partitioning at the beginning of each decode call
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset data partitioning at the beginning of each decode call

Prevents using GetBitContexts with data from previous calls.

Fixes access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agovp8: use a fixed-size edge emu buffer
Anton Khirnov [Mon, 20 Jan 2014 12:12:54 +0000 (13:12 +0100)]
vp8: use a fixed-size edge emu buffer

The reason is the same as for e588615d938f8581f0d6f3771662d08cadfc00de

Based on a patch by Ronald S. Bultje <rsbultje@gmail.com>

6 years agolavf: ignore attachment streams for interleaving purposes
Anton Khirnov [Mon, 20 Jan 2014 12:59:06 +0000 (13:59 +0100)]
lavf: ignore attachment streams for interleaving purposes

Those streams should never get any packets by definition.

6 years agolavf: do basic sanity checking on muxed packets
Anton Khirnov [Mon, 20 Jan 2014 13:10:01 +0000 (14:10 +0100)]
lavf: do basic sanity checking on muxed packets

Reject packets for non-existing or attachment streams.

6 years agoutvideoenc: Add support for the new BT.709 FourCCs for YCbCr
Jan Ekström [Sun, 2 Feb 2014 13:04:58 +0000 (15:04 +0200)]
utvideoenc: Add support for the new BT.709 FourCCs for YCbCr

With cli usage the decoder might have not set the colorspace during
encoder init, manual colorspace override might be needed in such
cases.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agovf_overlay: add eof_action switch
Keith Lawson [Mon, 3 Feb 2014 00:39:18 +0000 (19:39 -0500)]
vf_overlay: add eof_action switch

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agohevc: check that the VCL NAL types are the same for all slice segments of a frame
Anton Khirnov [Sun, 2 Feb 2014 12:35:48 +0000 (13:35 +0100)]
hevc: check that the VCL NAL types are the same for all slice segments of a frame

Fixes possible invalid memory access for mismatching skipped/non-skipped
slice segments.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Sample-Id: 00001533-google

6 years agoavcodec/h264: update current_sps & sps->new only after the whole slice header decoder...
Michael Niedermayer [Tue, 4 Feb 2014 01:20:59 +0000 (02:20 +0100)]
avcodec/h264: update current_sps & sps->new only after the whole slice header decoder and init code finished

This avoids them being cleared before the full initialization finished

Fixes out of array read
Fixes: asan_heap-oob_f0c5e6_7071_cov_1605985132_mov_h264_aac__Demo_FlagOfOurFathers.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: Disallow pps_id changing between slices
Michael Niedermayer [Mon, 3 Feb 2014 22:52:38 +0000 (23:52 +0100)]
avcodec/h264: Disallow pps_id changing between slices

Such changes are forbidden in H.264 and lead to race conditions

Fixes out of array read
Fixes: signal_sigsegv_f9796a_1613_cov_3114610371_FM1_BT_B.h264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: clear dequant8_coeff pointers if 8x8 mode is not enabled
Michael Niedermayer [Mon, 3 Feb 2014 21:15:32 +0000 (22:15 +0100)]
avcodec/h264: clear dequant8_coeff pointers if 8x8 mode is not enabled

This prevents stale pointers from being left

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix compilation with msvc/icl due to missing header and define.
Matt Oliver [Mon, 3 Feb 2014 06:46:11 +0000 (17:46 +1100)]
Fix compilation with msvc/icl due to missing header and define.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'dilaroga/master'
Michael Niedermayer [Mon, 3 Feb 2014 14:33:56 +0000 (15:33 +0100)]
Merge remote-tracking branch 'dilaroga/master'

* dilaroga/master:
  vda: fix crash when a frame is dropped.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/aac_adtstoasc_bsf: Fix memory leak
Alex Sukhanov [Mon, 3 Feb 2014 01:16:01 +0000 (17:16 -0800)]
avcodec/aac_adtstoasc_bsf: Fix memory leak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/utils.c: Cosmetics: Fix incorrect comma placement
Ståle Kristoffersen [Mon, 3 Feb 2014 10:35:19 +0000 (11:35 +0100)]
libavformat/utils.c: Cosmetics: Fix incorrect comma placement

6 years agoavcodec/aacdec: Fix pulse position checks in decode_pulses()
Michael Niedermayer [Mon, 3 Feb 2014 04:04:42 +0000 (05:04 +0100)]
avcodec/aacdec: Fix pulse position checks in decode_pulses()

Fixes out of array read
Fixes: asan_static-oob_1efed25_1887_cov_2013541199_HeyYa_RA10_AAC_192K_30s.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hnm4video: check offset before subtraction in decode_interframe_v4a()
Michael Niedermayer [Mon, 3 Feb 2014 02:10:46 +0000 (03:10 +0100)]
avcodec/hnm4video: check offset before subtraction in decode_interframe_v4a()

Fixes out of array read
Fixes: signal_sigsegv_1326a09_1752_cov_245452111_GRTH301.HNS
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRoQ encoder: support different integer framerates
addr-see-the-website@aetey.se [Sun, 2 Feb 2014 15:57:36 +0000 (16:57 +0100)]
RoQ encoder: support different integer framerates

Even though the most common framerate for RoQ is 30fps,
the format supports other framerates too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: use AVPROBE_SCORE_STREAM_RETRY, instead of AVPROBE_SCORE_RETRY - 1
Michael Niedermayer [Sun, 2 Feb 2014 22:48:37 +0000 (23:48 +0100)]
avformat: use AVPROBE_SCORE_STREAM_RETRY, instead of AVPROBE_SCORE_RETRY - 1

This makes the code clearer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: dvd still frames read thru libdvdnav ended up in internal lavf buffer
Voyager1 [Sun, 2 Feb 2014 14:36:20 +0000 (15:36 +0100)]
avformat/utils: dvd still frames read thru libdvdnav ended up in internal lavf buffer

This is the solution we've been using in XBMC for over 2 years for dvd still frames.
The problem is that the demuxer asks for probing of the codec in the mpeg stream.
This causes lavf to read the whole menu structure into internal buffers.
After which, it won't read from input stream anymore and no events triggers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/opengl_enc: fix parentheses in if condition
Lukasz Marek [Sun, 2 Feb 2014 13:29:21 +0000 (14:29 +0100)]
lavd/opengl_enc: fix parentheses in if condition

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/ebur128: add true peak metering per frame
Jean First [Sat, 25 Jan 2014 22:19:07 +0000 (23:19 +0100)]
lavfi/ebur128: add true peak metering per frame

Signed-off-by: Jean First <jeanfirst@gmail.com>
6 years agolavfi/ebur128: print peak metering in dBFS
Jean First [Sat, 25 Jan 2014 22:19:06 +0000 (23:19 +0100)]
lavfi/ebur128: print peak metering in dBFS

Signed-off-by: Jean First <jeanfirst@gmail.com>
6 years agolavfi/ebur128: add sample and true peak metering.
Clément Bœsch [Sat, 25 Jan 2014 22:19:05 +0000 (23:19 +0100)]
lavfi/ebur128: add sample and true peak metering.

Metadata injection and logging. Not yet present visually.

Signed-off-by: Jean First <jeanfirst@gmail.com>
6 years agolavfi/drawtext: fix reinit command
Andrey Utkin [Sat, 1 Feb 2014 13:47:25 +0000 (15:47 +0200)]
lavfi/drawtext: fix reinit command

Problem was that reinit argument wasn't used.
Regression came in at commit fd6228e65711e63a9e35e9a1087d7ce62040e6e3

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavfi/movie: fix display of pushed frame information
Stefano Sabatini [Sun, 2 Feb 2014 14:52:11 +0000 (15:52 +0100)]
lavfi/movie: fix display of pushed frame information

It was broken since 7e350379f87e7f7.

Also fix warnings:
libavfilter/src_movie.c: In function ‘describe_frame_to_str’:
libavfilter/src_movie.c:392:5: warning: ‘type’ is deprecated (declared at ./libavutil/frame.h:313) [-Wdeprecated-declarations]
libavfilter/src_movie.c:408:9: warning: ‘type’ is deprecated (declared at ./libavutil/frame.h:313) [-Wdeprecated-declarations]

6 years agodoc/APIchanges: fix weird reindent
Stefano Sabatini [Sun, 2 Feb 2014 11:58:22 +0000 (12:58 +0100)]
doc/APIchanges: fix weird reindent

6 years agolavf: add output_ts_offset option to AVFormatContext
Stefano Sabatini [Mon, 27 Jan 2014 18:16:45 +0000 (19:16 +0100)]
lavf: add output_ts_offset option to AVFormatContext

This option can be generally useful to set an output offset, needed when
setting an absolute index in the output.

6 years agolavf/avformat.h: fix typos
Stefano Sabatini [Sun, 2 Feb 2014 11:55:40 +0000 (12:55 +0100)]
lavf/avformat.h: fix typos

6 years agoffmpeg: tweak debug_ts logging and add more of it
Stefano Sabatini [Sat, 25 Jan 2014 13:12:15 +0000 (14:12 +0100)]
ffmpeg: tweak debug_ts logging and add more of it

Help with debugging timestamp issues.

6 years agoexamples/avio_reading: remove stray empty line
Stefano Sabatini [Sun, 2 Feb 2014 11:35:46 +0000 (12:35 +0100)]
examples/avio_reading: remove stray empty line

6 years agoexamples: add avio_reading.c example
Stefano Sabatini [Sun, 26 Jan 2014 17:30:06 +0000 (18:30 +0100)]
examples: add avio_reading.c example

6 years agolavfi/overlay: add yuv422 format mode
Stefano Sabatini [Fri, 24 Jan 2014 16:53:03 +0000 (17:53 +0100)]
lavfi/overlay: add yuv422 format mode

6 years agolibavformat/mtv: add test for audio magic
Reynaldo H. Verdejo Pinochet [Fri, 24 Jan 2014 21:40:04 +0000 (18:40 -0300)]
libavformat/mtv: add test for audio magic

MTV files have the string "MP3" as audio magic on their
header. Always.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agofate/xvid: fix idct & bitexact flag
Michael Niedermayer [Sun, 2 Feb 2014 04:56:30 +0000 (05:56 +0100)]
fate/xvid: fix idct & bitexact flag

should fix test to match on all platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '816e5b997028c8215c804b1e58b2388592ed612b'
Michael Niedermayer [Sun, 2 Feb 2014 04:40:30 +0000 (05:40 +0100)]
Merge commit '816e5b997028c8215c804b1e58b2388592ed612b'

* commit '816e5b997028c8215c804b1e58b2388592ed612b':
  hevc: Reject impossible slice segment

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e'
Michael Niedermayer [Sun, 2 Feb 2014 04:32:01 +0000 (05:32 +0100)]
Merge commit '09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e'

* commit '09e2203b8ba6943d5c0fe6d73b65b145c3fdf98e':
  hevc: Consider first quantization group any reference to 0, 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c716624853339ea4b1086a3957b334829370204c'
Michael Niedermayer [Sun, 2 Feb 2014 04:23:59 +0000 (05:23 +0100)]
Merge commit 'c716624853339ea4b1086a3957b334829370204c'

* commit 'c716624853339ea4b1086a3957b334829370204c':
  mxf: Read field dominance flag

Conflicts:
libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'
Michael Niedermayer [Sun, 2 Feb 2014 04:05:11 +0000 (05:05 +0100)]
Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'

* commit '7d56f2fffc14ad02001ee0689bee76a759da9ede':
  mxf: Handle negative edit_rate

Conflicts:
libavformat/mxfdec.c

See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Sun, 2 Feb 2014 01:42:09 +0000 (02:42 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/opengl_enc: remove inlines
  lavd/opengl_enc: fix window caption
  lavd/opengl_enc: simplify opengl_load_procedures usage
  lavd/opengl_enc: factorize deinit_context function
  lavd/opengl_enc: factorize create/release window functions
  lavd/opengl_enc: rename GL_RED_COMPONENT define
  lavd/opengl_enc: create format description table
  lavd/opengl_enc_shaders: make shaders code static and const

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: propagate error code from hls_coding_quadtree()
Michael Niedermayer [Sun, 2 Feb 2014 01:33:16 +0000 (02:33 +0100)]
avcodec/hevc: propagate error code from hls_coding_quadtree()

Fixes use of uninitialized memory
Fixes out of array read
Fixes: asan_static-oob_123cee5_2630_cov_1869071233_PICSIZE_A_Bossen_1.bin
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/opengl_enc: remove inlines
Lukasz Marek [Sun, 2 Feb 2014 01:26:02 +0000 (02:26 +0100)]
lavd/opengl_enc: remove inlines

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/opengl_enc: fix window caption
Lukasz Marek [Sun, 2 Feb 2014 00:21:53 +0000 (01:21 +0100)]
lavd/opengl_enc: fix window caption

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/opengl_enc: simplify opengl_load_procedures usage
Lukasz Marek [Sat, 1 Feb 2014 16:14:40 +0000 (17:14 +0100)]
lavd/opengl_enc: simplify opengl_load_procedures usage

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/opengl_enc: factorize deinit_context function
Lukasz Marek [Sat, 1 Feb 2014 16:13:15 +0000 (17:13 +0100)]
lavd/opengl_enc: factorize deinit_context function

This commit also fixes opengl deinitialization.
Program and shaders where not deleted.
Could impact MacOS implementation based on SDL window.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/opengl_enc: factorize create/release window functions
Lukasz Marek [Sat, 1 Feb 2014 13:39:37 +0000 (14:39 +0100)]
lavd/opengl_enc: factorize create/release window functions

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/opengl_enc: rename GL_RED_COMPONENT define
Lukasz Marek [Sat, 1 Feb 2014 13:29:13 +0000 (14:29 +0100)]
lavd/opengl_enc: rename GL_RED_COMPONENT define

Rename GL_RED_COMPONENT into FF_GL_RED_COMPONENT
to explicity mark it is internal define, not OpenGL API.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoavcodec/tiff: reset geotag_count in free_geotags()
Michael Niedermayer [Sun, 2 Feb 2014 00:47:36 +0000 (01:47 +0100)]
avcodec/tiff: reset geotag_count in free_geotags()

Fixes null pointer dereference
Fixes: signal_sigsegv_19d922e_3688_cov_1577641655_aletrek_tiff.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/opengl_enc: create format description table
Lukasz Marek [Sat, 1 Feb 2014 13:15:25 +0000 (14:15 +0100)]
lavd/opengl_enc: create format description table

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/opengl_enc_shaders: make shaders code static and const
Lukasz Marek [Thu, 30 Jan 2014 15:34:08 +0000 (16:34 +0100)]
lavd/opengl_enc_shaders: make shaders code static and const

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoavdevice/v4l2: only use average frame rate if set
Michael Niedermayer [Sat, 1 Feb 2014 23:11:16 +0000 (00:11 +0100)]
avdevice/v4l2: only use average frame rate if set

It might be unset on some platforms with some drivers and some input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice/v4l2: only use frame period from v4l2 if valid
Michael Niedermayer [Sat, 1 Feb 2014 23:10:43 +0000 (00:10 +0100)]
avdevice/v4l2: only use frame period from v4l2 if valid

There is evidence that some drivers do not set a valid value

See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718805
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRoQ-encoder: introducing Quake 3 compatibility option
addr-see-the-website@aetey.se [Fri, 31 Jan 2014 19:06:15 +0000 (20:06 +0100)]
RoQ-encoder: introducing Quake 3 compatibility option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRoQ decoder: Remove misleading diagnostics.
addr-see-the-website@aetey.se [Wed, 29 Jan 2014 13:33:45 +0000 (14:33 +0100)]
RoQ decoder: Remove misleading diagnostics.

It is not necessarily an error when a chunk does not cover a whole block.
Messages did not reflect the actual situation either.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vc1: reset fcm/field_mode in non advanced header parsing
Michael Niedermayer [Sat, 1 Feb 2014 18:04:37 +0000 (19:04 +0100)]
avcodec/vc1: reset fcm/field_mode in non advanced header parsing

Fixes NULL pointer dereference
Fixes: signal_sigsegv_1ab8bf4_2847_cov_4254117347_SA10091.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vc1: Check bfraction_lut_index
Michael Niedermayer [Sat, 1 Feb 2014 16:07:40 +0000 (17:07 +0100)]
avcodec/vc1: Check bfraction_lut_index

Fixes: out of array read
Fixes: asan_static-oob_1b40507_2849_SA10143.vc1
Fixes: asan_static-oob_1b40a15_2849_cov_1182297305_SA10143.vc1
Fixes: asan_static-oob_1b40f15_2849_cov_2159513432_SA10143.vc1
Fixes: asan_static-oob_1b40f15_2849_cov_3230311510_SA10143.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vc1: factor read_bfraction() out
Michael Niedermayer [Sat, 1 Feb 2014 16:06:24 +0000 (17:06 +0100)]
avcodec/vc1: factor read_bfraction() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: Reject impossible slice segment
Luca Barbato [Sat, 11 Jan 2014 10:32:07 +0000 (11:32 +0100)]
hevc: Reject impossible slice segment

A dependent slice cannot have address 0.
Prevent an out of array bound load in ff_hevc_cabac_init().

Sample-Id: 00001406-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agohevc: Consider first quantization group any reference to 0, 0
Luca Barbato [Sat, 11 Jan 2014 03:22:50 +0000 (04:22 +0100)]
hevc: Consider first quantization group any reference to 0, 0

According to my understanding of T-REC-H.265-2013044 chapter 8.6.1.

Sample-Id: 00001438-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agomxf: Read field dominance flag
Matthieu Bouron [Sat, 16 Feb 2013 12:52:29 +0000 (13:52 +0100)]
mxf: Read field dominance flag

And export the information in field_order.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agomxf: Handle negative edit_rate
Luca Barbato [Wed, 8 Jan 2014 00:20:00 +0000 (01:20 +0100)]
mxf: Handle negative edit_rate

Default to 1/25.