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

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

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

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

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

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

Related to CID1197063

The limit choosen is arbitrary and much larger than what makes sense.
It avoids the need for checking arithmetic operations with the length for overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f9158b01

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

The check is possibly redundant, but better to check for errors
that dont occur than to skip the check and crash

Fixes CID1197060
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 754f8466

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

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

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

This change make error handling simplier.
av_opt_freep_ranges may be called when some ranges are NULL,
for example after memory allocation fail.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3aac5fcf

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

fixes x264opts opengop=1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 64b79141

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

Fixes h264_mp4toannexb_bsf_failure.mkv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 289b149c

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

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

Should fix fate failure with clang ftrapv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c9c04512

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

Fixes ticket #3428.
(cherry picked from commit e3fd263f)

Revert "ff_id3v2_read: add option to limit ID3 magic number search"
Revert "ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL"

This reverts commit 7f8aa37b.
This reverts commit 5219e20d.

The actual predictor value, set by the trellis code, never
was written back into the variable that was written into
the block header. This was accidentally removed in b304244b.

This significantly improves the audio quality of the trellis
case, which was plain broken since b304244b

.

Encoding IMA QT with trellis still actually gives a slightly
worse quality than without trellis, since the trellis encoder
doesn't use the exact same way of rounding as in
adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble.

Fixes part of Ticket3701
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fa8f060b)

Conflicts:
	tests/ref/acodec/adpcm-ima_qt-trellis

This was broken in 095be4fb

 - samples+ch (for the previous
non-planar case) equals &samples_p[ch][0]. The confusion
probably stemmed from the IMA WAV case where it originally
was &samples[avctx->channels + ch], which was correctly
changed into &samples_p[ch][1].

Fixes part of Ticket3701
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a32765c4)

Fixes a regression since fb3e3808

 similar to ticket #2661,
reported by fluffrabbit at aol dot com.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 673716c5)

Conflicts:
	libavcodec/utvideodec.c

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

Conflicts:
	libavformat/avidec.c

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

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

Conflicts:
	libavcodec/vorbisdec.c

Fix trac ticket #3523.
(cherry picked from commit 1ba59b1c)

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

Conflicts:
	libavformat/avidec.c

Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.

[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]

Fixes ticket #3530.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5331773c)

Conflicts:
	libavformat/dsfdec.c
	libavformat/id3v2.c

Fixes ticket #3530.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c94305ae)

Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5800b085)

Conflicts:
	libavformat/matroskadec.c

avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks like its part of quicktime stsd

This is needed for matroska spec compliance
Fixes playback of SVQ3 in matroska with vlc
Fixes Ticket 3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8456bd2c)

Fixes ticket #3362.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a0911b05)

Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.

Fixes a regression since e41ea866

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

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

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

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

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

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

These ADPCM codecs include a per-frame flag that enables a raw 16-bit mode. Therefore
the the number of samples returned by get_nb_samples() is only ever approximate.

Fixes ticket #3460.
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73802014)

Fixes ticket #3461.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d1bb1794)

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

Conflicts:
	libavcodec/h264.c

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

Conflicts:
	libavformat/flvdec.c

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

* TimothyGu/release/1.2:
  configure: use pkg-config to detect libbluray
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #1796.
(cherry picked from commit c8f0b20b)

Conflicts:
	libavformat/avidec.c

The current configure fails when static libbluray is compiled with libxml2
support.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit baa650cc

)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	configure

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

Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0a8c9020

)

Conflicts:

	libavcodec/utvideoenc.c
(cherry picked from commit 57522ca79cc38c279123596d3288ddbf56fa8903)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>