* commit '62b1e3b1':
  aasc: Check minimum buffer size

Conflicts:
	libavcodec/aasc.c

See: e1631f8e
See: 8a57ca5cMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '45ee556d':
  qdm2: Whitespace cosmetics
  flac: use meaningful return values

Conflicts:
	libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f1cb490d':
  xl: Fix the buffer size check

Conflicts:
	libavcodec/xl.c

See: 8c59e0c3Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e13a9293':
  xl: K&R formatting cosmetics

Conflicts:
	libavcodec/xl.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

The patch worked on little endian because pgm decoding was broken
but it was not correct in any way.

This reverts commit 7651c0e4.

Breaks decoding pgms with 256 < maxval < 65535.

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

This reverts commit a0348d09.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libjpeg v6b apparently does not initialize the most significant bits
to zero when writing 12bit pgm's with maxval 4095.

The ljpeg decoder also supports gray images with
8 - 15 bits per component.

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

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

The option is used to sort the streams by program.
Signed-off-by: Florent Tribouilloy <florent.tribouilloy@smartjog.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

This fixes rendering of sections containing nested elements followed by
an array, for example as in the case:
programs->streams->stream

enabled by the -show_programs option.

Fix XML schema validation, since elements must appear in the same order
as specified in the schema.

Prevent some overreads.

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

* qatar/master:
  doc: cosmetics: Consistently format list and table items

Conflicts:
	doc/developer.texi
	doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bf4b0ed1':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5b097399':
  eval: Explicitly ignore return value of strtod() in parse_db()

Conflicts:
	libavutil/eval.c

See: 3cd9849dMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6ff15cd5':
  Remove unreachable returns
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c8f0b20b':
  avidec: Let the inner dv demuxer take care of discarding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '10aa44aa':
  avidec: K&R formatting cosmetics

Conflicts:
	libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Also make it the first check.

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

* commit '37063714':
  build: Only check FATE dependencies when running FATE tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '16c22122':
  h264: K&R formatting cosmetics

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '96668944':
  buffersink: K&R formatting cosmetics

Conflicts:
	libavfilter/buffersink.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Some decoders may output both, this way the decoder can set it.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Reported and tested by Dave Rice.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>