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

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

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

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

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

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

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

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

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

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

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

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

Conflicts:
	doc/encoders.texi

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

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

Conflicts:
	doc/encoders.texi

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

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

Might fix Ticket1907 (I have no testcase so i cant test)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4758e32a

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

Prevent assertion failure with damaged input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 338f8b2e)

Calculate the duration as accurately as possible to improve decoding of samples
where the last frame is smaller than the rest.
Signed-off-by: James Almer <jamrial@gmail.com>
Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit af248fa1)

Conflicts:
	libavformat/matroskadec.c

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

Tags must have at least one SimpleTag element to be spec conformant.
Updated lavf-mkv and seek-lavf-mkv FATE references as the tests were affected by
this.

Fixes ticket #2785
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 088ed531)

Conflicts:
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Fixes out of array accesses

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

Conflicts:

	libavcodec/h264.c

* commit '072be3e8

':
  h264: set parameters from SPS whenever it changes

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b9d887c2)

Conflicts:

	libavcodec/h264.c

Fixes out of array access
Fixes Ticket2895
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9a271a93

)

Conflicts:

	libavcodec/jpeg2000dec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array accesses
Fixes Ticket2850
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3819db74

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

Fixes out of array accesses
Fixes Ticket2844

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 880c73cd

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

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

Otherwise, during error conditions, the caller will be left with
dangling pointers to a destructed packet => boom.

BUG=242786
TEST=ffmpeg_regression_tests

Commit slightly simplified by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c54a1565

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

Fixes out of array access
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 88c1b0e7a852e48d9f0e3d79c44edaa86e59acfe)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2813
Fixes regression since 70b5583b

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

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

Conflicts:
	libavcodec/mpeg12dec.c

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

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

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

Fix null pointer dereference
Fixes Ticket2588
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bf87908c)

Conflicts:
	libavformat/rmdec.c

The volatile is not required here, and prevents a miscompilation with GCC
4.8.1 when building on x86 with --cpu=i686
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 659df32a)

This ensures that theres enough data for mpeg_probe() to recognize mpeg-ps
Fixes Ticket2583

Based on code by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c605adbf)

Fixes ticket #2688.
(cherry picked from commit 06bede95)

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

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

Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.

Fixes ticket #2625.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

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

Conflicts:
	libavcodec/h264_cavlc.c

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

Conflicts:
	libavformat/avienc.c

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

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

Fixes ticket #2561.
(cherry picked from commit 231b3317)

Fixes playback of test7.mkv validation test file.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 762d4335)

Fixes ticket #2533.
(cherry picked from commit a07ac1f7)