(cherry picked from commit b4bd21b7

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

Conflicts:
	doc/codecs.texi

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

In particular, fix wrong vertical mirroring command, and clarify
and extend explanation.

Based on a patch by littlebat <dashing.meng@gmail.com>.

Should fix trac ticket #2413.
(cherry picked from commit 215ca864

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

Conflicts:
	doc/filters.texi

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 6b255e5e

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

Conflicts:
	doc/encoders.texi

Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/



Also merge the two option sections (Mapping and Private options).

Patch partially edited by Stefano Sabatini.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 11cb6975

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

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 561e0513

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

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 4ec46b11

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

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 7eb5288f

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

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 934df3b0

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

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 83647ace

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

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 6fe419bf

)
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>

(cherry picked from commit ea038b99

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

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

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

Signed-off-by: Clément Bœsch <ubitux@gmail.com>
(cherry picked from commit 87417300

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

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

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

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)

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)

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>

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>

Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f58cd286

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

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

)

Conflicts:

	libavfilter/vf_delogo.c
	libavfilter/vf_fieldmatch.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_hflip.c
	libavfilter/vf_kerndeint.c
	libavfilter/vf_lut.c
	libavfilter/vf_pad.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_vignette.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2859

Note, testcases related to the downmix channels are welcome.
(id like to make sure this is working correctly now, as obviously it didnt
 work before ...)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c56d4dab)

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

Without this the block_align or bitrate value is not available to the decoder

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

Fixes Ticket2813
Fixes regression since 70b5583b

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

Breaks decoding pgms with 255 < maxval < 65535.

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.

This reverts commit a0348d09.
(cherry picked from commit 768e40b4)

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

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

Conflicts:
	libavformat/dtsdec.c

Slice threading does not work with hardware acceleration, as decoding
is per-picture.  This fixes Bugzilla #542.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 93a51984)

Conflicts:
	libavcodec/mpeg12dec.c

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

Conflicts:
	libswscale/input.c