ffmpeg.git
5 years agolavf/matroskadec ReferenceBlock is a signed integer
Jan Gerber [Sat, 16 Nov 2013 00:12:20 +0000 (01:12 +0100)]
lavf/matroskadec ReferenceBlock is a signed integer

according to the Matroska Specification
ReferenceBlock is a signed integer too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8cc59ec881b8706fb3036a2a83f7ededa468dedb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/matroska*: DiscardPadding is a signed integer
Jan Gerber [Thu, 14 Nov 2013 11:58:28 +0000 (12:58 +0100)]
lavf/matroska*: DiscardPadding is a signed integer

according to the Matriska Specification
 http://matroska.org/technical/specs/index.html
DiscardPadding is a signed integer.

Tested-by: Jan Gerber <j@v2v.cc>
Tested-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f4b1ca99ff86c6ba78e1b4730c85eac0d5a5817a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroska: simplify signed int access code
Michael Niedermayer [Fri, 15 Nov 2013 20:30:30 +0000 (21:30 +0100)]
avformat/matroska: simplify signed int access code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cddd15ba5c9cd2e92d2f2942e0fc40bf3bf56115)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/matroska*: add support for signed integers
Jan Gerber [Fri, 15 Nov 2013 18:00:37 +0000 (19:00 +0100)]
lavf/matroska*: add support for signed integers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d03eea36b2c329241f63c8aca2d6adbb6ea81d9c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeg2000dec: Check precno before using it in JPEG2000_PGOD_CPRL
Michael Niedermayer [Sun, 24 Nov 2013 02:50:20 +0000 (03:50 +0100)]
avcodec/jpeg2000dec: Check precno before using it in JPEG2000_PGOD_CPRL

Fixes out of array reads
Fixes: asan_heap-oob_f0de57_6823_mjp2.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3d5a5e86be2a65e33c34ab3ad7923f54e8e49c1d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_sub...
Michael Niedermayer [Thu, 21 Nov 2013 01:32:37 +0000 (02:32 +0100)]
avcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_subtitle2()

This code changes the input packet, which is read only and can in
rare circumstances lead to decoder errors. (i run into one of these in
the audio decoder, which corrupted the packet during av_find_stream_info()
so that actual decoding that single packet failed later)
Until a better fix is implemented, this commit limits the problem.
A better fix might be to make the subtitle decoders not depend on
data[size] = 0 or to copy their input when this is not the case.
(cherry picked from commit 01923bab98506b1e98b4cbf08419364ce6ffea6d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_format: check that the format list is not empty
Michael Niedermayer [Sun, 5 Jan 2014 19:14:03 +0000 (20:14 +0100)]
avfilter/vf_format: check that the format list is not empty

Fixes Ticket3210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee16e0cacc16ea60c35a66796410012755263c3c)

5 years agoavformat/oggdec: dont read timestamps from EOS pages of ogm videos
Michael Niedermayer [Sat, 4 Jan 2014 16:33:59 +0000 (17:33 +0100)]
avformat/oggdec: dont read timestamps from EOS pages of ogm videos

Some muxers store invalid timestamps there, which breaks seeking
Fixes Ticket2739

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5e0c7eab2a9d43e6e3be967ec1a6b04a3e0328da)

5 years agomatroskadec: Fix bug when parsing realaudio codec parameters
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>
(cherry picked from commit 0d944ee34349805b29f9c91b15c8009d16df01ab)

5 years agoconfigure: Special case libfreetype test
Alexander Strasser [Fri, 6 Dec 2013 16:20:26 +0000 (17:20 +0100)]
configure: Special case libfreetype test

Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.

(cherry picked from commit cea5812fa723c08b89d929eeba73462e05de2973)

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
5 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>
(cherry picked from commit de2a2caf4dedb28a959d0ff6f02751bb6c3ff033)

5 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>
(cherry picked from commit 6da21c1f8190d674fd1e5619bb148c1bbab8ca3c)

5 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>
(cherry picked from commit f93b0abe4041b75f0dbb590ee932b37a07662856)

5 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>
(cherry picked from commit fcbb94712d9873a37cdc8b526e368154b5982186)

5 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>
(cherry picked from commit ed5bed4152203aed8cce01a679bed67bbda8903f)

5 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>
(cherry picked from commit d307e408d4a9ada22df443cc38be77cc5e492694)

5 years agoswscale/utils: check chroma width for fast bilinear scaler
Michael Niedermayer [Sun, 15 Dec 2013 13:13:55 +0000 (14:13 +0100)]
swscale/utils: check chroma width for fast bilinear scaler

Fixes artifacts where fast bilinear was used for downscaling chroma

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 037fc3b054b10aee0f11fdbe835e5dffa8e95b37)

5 years agoswscale/utils: remove useless ()
Michael Niedermayer [Sun, 15 Dec 2013 13:10:02 +0000 (14:10 +0100)]
swscale/utils: remove useless ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 554e913fd7acc9da02ddac2c5ce9487f7f633c92)

5 years agoavcodec/cabac: force get_cabac to be not inlined
Michael Niedermayer [Thu, 5 Dec 2013 00:41:10 +0000 (01:41 +0100)]
avcodec/cabac: force get_cabac to be not inlined

works around bug in gccs inline asm register assignment
Fixes Ticket3177

gcc from 4.4 to 4.6 is affected at least, no non affected gccs known
clang seems not affected

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0538b29ae8002c44f27bae8a1a6fc6e646998be5)

5 years agoavcodec/error_resilience: check that er is supported before attempting to read the...
Michael Niedermayer [Fri, 6 Dec 2013 15:49:35 +0000 (16:49 +0100)]
avcodec/error_resilience: check that er is supported before attempting to read the status of the previous slice

Fixes incorrectly set error_occured and improves speed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 90539cea336fd513c47295a03c164cb4a851166f)

5 years agoavcodec/error_resilience: factor er_supported() check out
Michael Niedermayer [Fri, 6 Dec 2013 15:49:00 +0000 (16:49 +0100)]
avcodec/error_resilience: factor er_supported() check out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit afb18c55783362546b5e512ce01b7fe7bf5744d9)

5 years agoavfilter/vf_pad: fix req_end
Michael Niedermayer [Tue, 3 Dec 2013 03:08:37 +0000 (04:08 +0100)]
avfilter/vf_pad: fix req_end

Fixes out of array accesses
Fixes Ticket3190

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0cc5011f9a1b05132f9a20a71feb031f30a8a53b)

5 years agoavcodec/h264_refs: improve key frame detection heuristic
Michael Niedermayer [Mon, 2 Dec 2013 01:36:58 +0000 (02:36 +0100)]
avcodec/h264_refs: improve key frame detection heuristic

Fixes Ticket3186

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e3d7a3978b857e32b32575ff78ecc7d67a18687e)

5 years agoavcodec/h264_refs: split conditions of if() up for better readability
Michael Niedermayer [Mon, 2 Dec 2013 01:12:39 +0000 (02:12 +0100)]
avcodec/h264_refs: split conditions of if() up for better readability

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ab6ea7a81921a168575be63b3d9049ca716e707a)

Conflicts:
libavcodec/h264_refs.c

5 years agolavc/srtenc: use bprint for text buffers.
Nicolas George [Mon, 25 Nov 2013 15:27:41 +0000 (16:27 +0100)]
lavc/srtenc: use bprint for text buffers.

Fix trac ticket #3120.
(cherry picked from commit 4b1c9b720e11d200ca7090210b34c409f43fafeb)

5 years agoffmpeg: set VCFR when copying timestamps
Michael Niedermayer [Thu, 28 Nov 2013 01:28:50 +0000 (02:28 +0100)]
ffmpeg: set VCFR when copying timestamps

This fixes unreasonable initial frame repeats
Fixes Ticket3176

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 738ebb4a0e0c8fbdc83b44cf30b8c9b7ac866270)

5 years agolavfi/af_pan: support unknown layouts on input.
Nicolas George [Fri, 25 Oct 2013 14:12:06 +0000 (16:12 +0200)]
lavfi/af_pan: support unknown layouts on input.

Fix trac ticket #2899.
(cherry picked from commit 7b0a587393e03dab552d66450d43ab82bda0a5a1)

5 years agolavfi/af_pan: support unknown layouts on output.
Nicolas George [Fri, 25 Oct 2013 14:02:04 +0000 (16:02 +0200)]
lavfi/af_pan: support unknown layouts on output.
(cherry picked from commit 4e9adc9b7363cc336e3d47c98455e1508902fd29)

5 years agolswr: fix assert failure on unknown layouts.
Nicolas George [Fri, 25 Oct 2013 14:11:30 +0000 (16:11 +0200)]
lswr: fix assert failure on unknown layouts.
(cherry picked from commit 4a640a6ac89099bfb02d6d3d3ada04e321a37476)

5 years agolavfi: parsing helper for unknown channel layouts.
Nicolas George [Fri, 25 Oct 2013 13:07:40 +0000 (15:07 +0200)]
lavfi: parsing helper for unknown channel layouts.

Make ff_parse_channel_layout() accept unknown layouts too.
(cherry picked from commit 6e2473edfda26a556c615ebc04d8aeba800bef7e)

5 years agolavfi/avfiltergraph: do not reduce incompatible lists.
Nicolas George [Tue, 3 Sep 2013 20:13:49 +0000 (22:13 +0200)]
lavfi/avfiltergraph: do not reduce incompatible lists.

A list of "all channel layouts" but not "all channel counts"
can not be reduced to a single unknown channel count.
(cherry picked from commit d300f5f6f570659e4b58567b35c9e8600c9f2956)

5 years agolavfi/avfiltergraph: suggest a solution when format selection fails.
Nicolas George [Tue, 3 Sep 2013 20:12:54 +0000 (22:12 +0200)]
lavfi/avfiltergraph: suggest a solution when format selection fails.

Format selection can fail if unknown channel layouts are used
with filters that do not support it.
(cherry picked from commit f775eb3fb4c7b716107355e428e40cb63f71ee7a)

5 years agolavd/lavfi: support unknown channel layouts.
Nicolas George [Mon, 28 Oct 2013 10:50:09 +0000 (11:50 +0100)]
lavd/lavfi: support unknown channel layouts.
(cherry picked from commit 863fb11f63f7f60feec390f3c54dd13606e07d05)

5 years agoupdate for 2.1.1 n2.1.1
Michael Niedermayer [Wed, 20 Nov 2013 02:12:11 +0000 (03:12 +0100)]
update for 2.1.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pcm-dvd: fix 20/24bit 1 channel
Michael Niedermayer [Mon, 18 Nov 2013 19:56:40 +0000 (20:56 +0100)]
avcodec/pcm-dvd: fix 20/24bit 1 channel

Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ab184b298d4a54199986de10927258aed18c7b6b)

5 years agoavcodec/pcm-dvd: fix 20bit 2 channels
Michael Niedermayer [Mon, 18 Nov 2013 19:56:40 +0000 (20:56 +0100)]
avcodec/pcm-dvd: fix 20bit 2 channels

Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5db49fc38d9132e134de92584f296559bec3b789)

5 years agoavformat/mpegts: fix resync seek
Michael Niedermayer [Mon, 18 Nov 2013 15:38:12 +0000 (16:38 +0100)]
avformat/mpegts: fix resync seek

The seek ended up seeking before the begin, which caused problems
Fixes initial sync issues with libbluray
Fixes Ticket3117

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7d0e927a31edb5fb584c2ab17f7fd676838d6639)

5 years agoavformat/utils: dont count attached pics toward the probesize
Michael Niedermayer [Mon, 18 Nov 2013 02:02:36 +0000 (03:02 +0100)]
avformat/utils: dont count attached pics toward the probesize

Such pics behave more like headers which we also dont count.
Fixes Ticket3146

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a8dec360c5db15e8da4b44ff3c0f02a6c57e8ac0)

5 years agobuild: avoid stdin stall with GNU AS probing.
Clément Bœsch [Fri, 8 Nov 2013 22:55:06 +0000 (23:55 +0100)]
build: avoid stdin stall with GNU AS probing.

a758c5e added probing for various tools, such as AS. Unfortunately, GNU
AS is reading stdin with -v, and thus configure is stalled with
configure arguments such as --as=as.

Fixes Ticket #1898.
(cherry picked from commit dbb41f93c16cbc65a899a75723c95da51c851cd5)

5 years agoavformat/image2: allow muxing gif files.
Clément Bœsch [Sat, 19 Oct 2013 17:39:28 +0000 (19:39 +0200)]
avformat/image2: allow muxing gif files.

Fixes Ticket #2936.
(cherry picked from commit f70db22999d713da3306bf29ec763d670b9bf1ea)

5 years agoavcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()
Michael Niedermayer [Thu, 31 Oct 2013 22:29:01 +0000 (23:29 +0100)]
avcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()

Fixes Ticket3103

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73d887733dc2ccb5d570615a753d5c44c3f1d9a4)

5 years agoFix example in pullup documentation.
Lou Logan [Tue, 12 Nov 2013 13:22:15 +0000 (14:22 +0100)]
Fix example in pullup documentation.

The pullup filter does not work well with the fps filter, it
currently needs -r

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
(cherry picked from commit 6d90a5c149fbdf9678c3f03fac820f835665b985)

5 years agoavutil: reintroduce lls1 as the 52 ABI needs it
Michael Niedermayer [Fri, 15 Nov 2013 22:32:51 +0000 (23:32 +0100)]
avutil: reintroduce lls1 as the 52 ABI needs it

lls1 taken from ff130d7

This is incompatible with libavcodec version
55.18.100 to 55.43.100 except 55.39.101
This incompatibility is caused by these libavcodec versions depending on
a libavutil 52 which is ABI incompatible with the previous ABI 52

you can avoid this incompatibility by upgrading your libavcodec so it
does no longer depend on the invalid ABI

See: 502ab21af0ca68f76d6112722c46d2f35c004053
See: cc6714bb16b1f0716ba43701d47273dbe9657b8b
See: 41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2
See: Ticket3136
Tested-by: marillat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b382d09d29be90e0947295a70cdcbaa60b9030b8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agorename new lls code to lls2 to avoid conflict with the old which has a different ABI
Michael Niedermayer [Sat, 16 Nov 2013 15:42:57 +0000 (16:42 +0100)]
rename new lls code to lls2 to avoid conflict with the old which has a different ABI

also remove failed attempt at a compatibility layer, the code simply cannot work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3814ab654a993723b0e5f14cc252d68f233ad79)

Conflicts:

libavcodec/version.h

5 years agoavutil: rename lls to lls2
Michael Niedermayer [Fri, 15 Nov 2013 21:35:46 +0000 (22:35 +0100)]
avutil: rename lls to lls2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bbe66ef912470007f7cc424badde2ccec500b36b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Do not fill gap before the first decodable frame on single stream input files...
Michael Niedermayer [Thu, 14 Nov 2013 00:21:20 +0000 (01:21 +0100)]
ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it.

Fixes different behavior to JM and probably several if not all
reference decoders.

We cannot just do this unconditionally as it would ruin AV sync in
some use cases.

Bug-Found-by: BugMaster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d7ebeba80c609e160a171168b3434c342a652237)

Conflicts:

ffmpeg.c

5 years agompeg12dec: Remove incomplete and wrong UV swapping code for VCR2
Diego Biurrun [Wed, 13 Nov 2013 17:44:25 +0000 (18:44 +0100)]
mpeg12dec: Remove incomplete and wrong UV swapping code for VCR2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 321514042534a2501a9f6223b88f0d2b8060f858)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: Fix swapping of UV planes for VCR2
Kostya Shishkov [Wed, 13 Nov 2013 17:44:26 +0000 (18:44 +0100)]
mpegvideo: Fix swapping of UV planes for VCR2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bae14f38d992f326c94d93f01197ccd84ea62053)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: Do not treat the initial frame special in handling of frame gaps
Michael Niedermayer [Thu, 14 Nov 2013 10:27:45 +0000 (11:27 +0100)]
h264: Do not treat the initial frame special in handling of frame gaps

The not handling of frame gaps has lead to the lack of a dummy reference
frame, which has lead to the failure of decode_slice_header() which has
lead to one SEI recovery message being skiped which had introduced a
slightly suboptimal recovery point for at least 1 h264 file compared to
JM.

Found-by: Carl & BugMaster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9e5ef1c5c37208326c59d642e2dc7afd3f10b09b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1enc: Check high bpp RGB against coder type too
Michael Niedermayer [Sun, 3 Nov 2013 21:11:11 +0000 (22:11 +0100)]
avcodec/ffv1enc: Check high bpp RGB against coder type too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: never decrease has_b_frames in compute_pkt_fields()
Michael Niedermayer [Sun, 3 Nov 2013 20:26:40 +0000 (21:26 +0100)]
avformat/utils: never decrease has_b_frames in compute_pkt_fields()

The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values

Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b73a3f6f6598cb9249034fa020ddead3c943e2f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0
Michael Niedermayer [Thu, 31 Oct 2013 09:54:46 +0000 (10:54 +0100)]
avcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0

Fixes overreads in HEVC
Fixes Ticket3070
Also fixed remaining issues from Ticket3075 and Ticket3076

Some lines of code taken from  0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/x86/cabac.h
and                            0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/cabac_functions.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fa6fa2162b730336fc1d6ee0d547dcc81f4afbad)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/thp: force moving forward
Michael Niedermayer [Thu, 31 Oct 2013 01:26:07 +0000 (02:26 +0100)]
avformat/thp: force moving forward

Fixes infinite loop
Fixes Ticket3098

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6c4b87d3d6ae08a6da16b4616626b4d2a726afbf)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/thp: fix variable types to avoid overflows
Michael Niedermayer [Thu, 31 Oct 2013 01:19:40 +0000 (02:19 +0100)]
avformat/thp: fix variable types to avoid overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2b1056e4e27b046af3777e8bd65a5145abff878f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec: check err value for ls_get_code_runterm()
Michael Niedermayer [Wed, 30 Oct 2013 22:27:28 +0000 (23:27 +0100)]
avcodec/jpeglsdec: check err value for ls_get_code_runterm()

Fixes infinite loop
Fixes Ticket3086

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cc0e47b55096361723b364afa43b79a3f5619cdc)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/spdifdec: fix demuxing of AAC in IEC 61937
Anssi Hannula [Tue, 29 Oct 2013 20:25:27 +0000 (22:25 +0200)]
lavf/spdifdec: fix demuxing of AAC in IEC 61937

Return value of avpriv_aac_parse_header() is not checked correctly. Fix
it.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f86387b6c2b11650cb9d5a8fd886be76e48c665b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: fix cookies
Michael Niedermayer [Thu, 31 Oct 2013 00:42:13 +0000 (01:42 +0100)]
avformat/http: fix cookies

Fixes Ticket3096

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198)

5 years agoavcodec/bink: fix seeking to frame 0
Michael Niedermayer [Wed, 30 Oct 2013 22:56:52 +0000 (23:56 +0100)]
avcodec/bink: fix seeking to frame 0

Fixes Ticket3088

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cb52d6da0a9c88c584a38a9a7a94825565854b7e)

5 years agoupdate for 2.1 n2.1
Michael Niedermayer [Mon, 28 Oct 2013 00:14:54 +0000 (01:14 +0100)]
update for 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/RELEASE_NOTES: update for 2.1
Michael Niedermayer [Mon, 28 Oct 2013 00:13:46 +0000 (01:13 +0100)]
doc/RELEASE_NOTES: update for 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/pulse_audio_enc: remove double ;
Michael Niedermayer [Sun, 27 Oct 2013 23:52:11 +0000 (00:52 +0100)]
avdevice/pulse_audio_enc: remove double ;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: add 2 missing hashes & versions
Michael Niedermayer [Sun, 27 Oct 2013 23:45:19 +0000 (00:45 +0100)]
doc/APIchanges: add 2 missing hashes & versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: update which releases i maintain
Michael Niedermayer [Sun, 27 Oct 2013 23:40:15 +0000 (00:40 +0100)]
MAINTAINERS: update which releases i maintain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: add 2.1
Michael Niedermayer [Sun, 27 Oct 2013 23:39:34 +0000 (00:39 +0100)]
Changelog: add 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: add decode hrd
Mickaël Raulet [Sun, 27 Oct 2013 18:33:05 +0000 (19:33 +0100)]
hevc: add decode hrd
(cherry picked from commit ab4061dff796b1dd2bc884101226aab48c2c875e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: better mt implementation
Anton Khirnov [Sun, 27 Oct 2013 15:50:20 +0000 (16:50 +0100)]
hevc: better mt implementation

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
(cherry picked from commit 93afb8c519deca85b3c97804927de5b016dd32d1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: clean up mvs(cherry picked from commit 955317c09b877a513d3fcfcd1615909b2f4f651c)
Mickaël Raulet [Sun, 27 Oct 2013 15:50:20 +0000 (16:50 +0100)]
hevc: clean up mvs(cherry picked from commit 955317c09b877a513d3fcfcd1615909b2f4f651c)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: cosmetic change(cherry picked from commit 3b57513b3f39c04337801fb9d159c7ca8dfa9deb)
Mickaël Raulet [Sun, 27 Oct 2013 14:26:58 +0000 (15:26 +0100)]
hevc: cosmetic change(cherry picked from commit 3b57513b3f39c04337801fb9d159c7ca8dfa9deb)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: more cosmetic(cherry picked from commit 9697abe41daa234602915f85bf6b1c0ca0252cff)
Mickaël Raulet [Sun, 27 Oct 2013 12:29:50 +0000 (13:29 +0100)]
hevc: more cosmetic(cherry picked from commit 9697abe41daa234602915f85bf6b1c0ca0252cff)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc : cosmetic changes(cherry picked from commit 7308c0ccf13f18cebe4851e6dcd6b5c0b09...
Mickaël Raulet [Sun, 27 Oct 2013 11:56:48 +0000 (12:56 +0100)]
hevc : cosmetic changes(cherry picked from commit 7308c0ccf13f18cebe4851e6dcd6b5c0b09be1dd)

Decreases the difference to Anton Khirnovs patch v5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc: add support for CODEC_CAP_DELAY in subtitles
Marton Balint [Wed, 23 Oct 2013 18:55:24 +0000 (20:55 +0200)]
lavc: add support for CODEC_CAP_DELAY in subtitles

This patch adds CODEC_CAP_DELAY support to avcodec_decode_subtitle2.

For DVB teletext decoding, a single teletext packet can contain multiple
teletext pages. In order to support that, the teletext decoder may buffer
some pages.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/fbdev_enc: remove unused variables
Lukasz Marek [Sun, 27 Oct 2013 21:35:54 +0000 (22:35 +0100)]
lavd/fbdev_enc: remove unused variables

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set
Michael Niedermayer [Sun, 27 Oct 2013 21:22:23 +0000 (22:22 +0100)]
avcodec/hevc: calculate checksum only if AV_EF_EXPLODE is set

This avoids a slowdown with the default of enabled CRC checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "avcodec/options_table: disable CRC checking by default"
Michael Niedermayer [Sun, 27 Oct 2013 21:21:09 +0000 (22:21 +0100)]
Revert "avcodec/options_table: disable CRC checking by default"

This reverts commit c7027ce9eac04fb20bd85fa37dbf24856c080c45.

It appears there is no complete consensus on this currently.

5 years agoRevert "avcodec/options_table: set err_detect to careful by default"
Michael Niedermayer [Sun, 27 Oct 2013 21:20:39 +0000 (22:20 +0100)]
Revert "avcodec/options_table: set err_detect to careful by default"

This reverts commit b1348eb68b432041b2557b9073590cf0fa60ff14.

5 years agolavd/fbdev_enc: more stream validation restrictive
Lukasz Marek [Sun, 27 Oct 2013 20:41:27 +0000 (21:41 +0100)]
lavd/fbdev_enc: more stream validation restrictive

So far fbdev_enc device picked up first video stream and ignored others.
It is required to provide exactly one video stream now.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd/pulse_audio_enc: more stream validation restrictive
Lukasz Marek [Sun, 27 Oct 2013 20:27:39 +0000 (21:27 +0100)]
lavd/pulse_audio_enc: more stream validation restrictive

So far pulse device picked up first audio stream and ignored others.
It is required to provide exactly one audio stream now.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd:pulse_audio_enc: fix array compared against 0
Lukasz Marek [Sun, 27 Oct 2013 20:18:27 +0000 (21:18 +0100)]
lavd:pulse_audio_enc: fix array compared against 0

fixes CID 1113222

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavd/pulse_audio_enc: fix timestamp calculation
Lukasz Marek [Thu, 24 Oct 2013 13:11:19 +0000 (15:11 +0200)]
lavd/pulse_audio_enc: fix timestamp calculation

Current implementation didn't include duration of
last processed packet.
Also remove access to st->cur_dts and replace with pkt->pts.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolibavfilter/vf_noise: relicense to LGPL
Paul B Mahol [Sat, 26 Oct 2013 19:47:28 +0000 (19:47 +0000)]
libavfilter/vf_noise: relicense to LGPL

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/options_table: set err_detect to careful by default
Michael Niedermayer [Sun, 27 Oct 2013 08:17:47 +0000 (09:17 +0100)]
avcodec/options_table: set err_detect to careful by default

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/options_table: disable CRC checking by default
Anton Khirnov [Fri, 25 Oct 2013 14:41:48 +0000 (16:41 +0200)]
avcodec/options_table: disable CRC checking by default

3 runs each of fate-suite/hevc-conformance/ENTP_C_LG_3.bit

with crc flag
1841819858 decicycles in frame decode, 32 runs, 0 skips
1833937180 decicycles in frame decode, 32 runs, 0 skips
1843283884 decicycles in frame decode, 32 runs, 0 skips

without crc flag
1703897301 decicycles in frame decode, 32 runs, 0 skips
1695031879 decicycles in frame decode, 32 runs, 0 skips
1697524383 decicycles in frame decode, 32 runs, 0 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/takdec: also do crc check when er compliant is set
Michael Niedermayer [Sun, 27 Oct 2013 08:28:30 +0000 (09:28 +0100)]
avcodec/takdec: also do crc check when er compliant is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavio: Check for memory allocation failure of private data
Derek Buitenhuis [Tue, 22 Oct 2013 19:22:13 +0000 (20:22 +0100)]
avio: Check for memory allocation failure of private data

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavfiltergraph: Properly handle memory allocation failure
Derek Buitenhuis [Tue, 22 Oct 2013 18:40:05 +0000 (19:40 +0100)]
avfiltergraph: Properly handle memory allocation failure

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agotimefilter: Handle memory allocation failure
Derek Buitenhuis [Tue, 22 Oct 2013 17:46:37 +0000 (18:46 +0100)]
timefilter: Handle memory allocation failure

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavcodec/avcodec.h: Add documentation for the AV_EF_* defifines
Michael Niedermayer [Sun, 27 Oct 2013 18:31:40 +0000 (19:31 +0100)]
avcodec/avcodec.h: Add documentation for the AV_EF_* defifines

The documentation is copied from the AVOption texts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocorrect the AVOption documentation for AV_EF_CAREFUL
Michael Niedermayer [Sun, 27 Oct 2013 18:28:31 +0000 (19:28 +0100)]
correct the AVOption documentation for AV_EF_CAREFUL

The flag was and is intended to be a sane default and thus does not enable
time consuming checks. This also matches how the flag is used in decoders and
demuxers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: add mergeplanes filter
Paul B Mahol [Fri, 27 Sep 2013 18:37:51 +0000 (18:37 +0000)]
avfilter: add mergeplanes filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoffmpeg_filter: Fix non jpeg yuv in jpeg support
Michael Niedermayer [Wed, 2 Oct 2013 12:16:12 +0000 (14:16 +0200)]
ffmpeg_filter: Fix non jpeg yuv in jpeg support

This is a regression, did not bisect so dont know what caused it but
likely some changes to the command line handling code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: make "first_dts not matching first dts in the queue" message more...
Michael Niedermayer [Sat, 28 Sep 2013 02:06:13 +0000 (04:06 +0200)]
avformat/utils: make "first_dts not matching first dts in the queue" message more informative

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/encoders: replace @xref with @ref command
Stefano Sabatini [Sun, 27 Oct 2013 14:31:38 +0000 (15:31 +0100)]
doc/encoders: replace @xref with @ref command

@xref is ignored by texi2pod.

5 years agovp9: skip itxfm_add if the whole block has no coefficients.
Ronald S. Bultje [Sun, 27 Oct 2013 13:13:11 +0000 (09:13 -0400)]
vp9: skip itxfm_add if the whole block has no coefficients.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/videodsp: Small speedups in ff_emulated_edge_mc x86 SIMD.
Ronald S. Bultje [Sat, 26 Oct 2013 12:24:09 +0000 (08:24 -0400)]
avcodec/x86/videodsp: Small speedups in ff_emulated_edge_mc x86 SIMD.

Don't use word-size multiplications if size == 2, and if we're using
SIMD instructions (size >= 8), complete leftover 4byte sets using movd,
not mov. Both of these changes lead to minor speedups.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/videodsp: fix a bug in a %if statement where we used '%%' instead of...
Ronald S. Bultje [Sat, 26 Oct 2013 12:24:09 +0000 (08:24 -0400)]
avcodec/x86/videodsp: fix a bug in a %if statement where we used '%%' instead of '&&'.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/overlay: correct small error in intersection detection
Benedict Endemann [Sat, 26 Oct 2013 13:22:44 +0000 (15:22 +0200)]
lavfi/overlay: correct small error in intersection detection

The image size of the destination image was used to determine if a source
image was positioned outside the destination image, that no intersection
could occur.  Actually for these two cases the size of the source image
has to be used!

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agovcodec/vc1dec: remove dead code
Michael Niedermayer [Sun, 27 Oct 2013 12:34:35 +0000 (13:34 +0100)]
vcodec/vc1dec: remove dead code

Fixes CID732196

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vc1_parser: check ff_vc1_parse_frame_header*() return value
Michael Niedermayer [Sun, 27 Oct 2013 12:28:08 +0000 (13:28 +0100)]
avcodec/vc1_parser: check ff_vc1_parse_frame_header*() return value

Fixed CID739860

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: factorize offset init code
Michael Niedermayer [Sun, 27 Oct 2013 12:10:06 +0000 (13:10 +0100)]
avcodec/tiff: factorize offset init code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/tiff: remove TIFF_LONG special case
Michael Niedermayer [Sun, 27 Oct 2013 12:07:44 +0000 (13:07 +0100)]
avcodec/tiff: remove TIFF_LONG special case

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