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

* qatar/master:
  oggparsetheora: check av_mallocz result
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5e5fb218':
  oggparsetheora: return meaningful error codes

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

* commit 'd4c12b8b':
  oggparsetheora: K&R cosmetics, reformat

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

* commit 'b9589f5a':
  lavc: add error checking to apply_param_change.

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

* commit '5c0a0983':
  libopenjpegdec: return meaningful error codes

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

Also typedef the private data struct and make its name consistent with
the rest of Libav.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

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

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>

* qatar/master:
  build: remove pointless condition

See: 94d707afMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '58d13cea':
  h264: Check all allocations

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

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

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

* commit '9510d768':
  fate.sh: Allow non-fast-forwards when updating sources
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c872d310':
  avconv: stop accessing AVStream.parser

Conflicts:
	ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This should fix several fate failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8b64c2ba':
  lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '25c7db7c':
  avio: Check for memory allocation failure of private data

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

* commit '327c439f':
  timefilter: Handle memory allocation failure

Conflicts:
	libavdevice/jack_audio.c
	libavdevice/timefilter.c

See: 6ef30976Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e7891305':
  configure: Provide an hardened toolchain option
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'dcd3eda6':
  configure: Move gcc-only -W option where it belongs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Regression since ac9529ce.

Spotted by Timothy Gu.

Also rename section name, to match the other ones adopting the muxer name
(rather than the related upcased standard name).

Fixes crash found by saste
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Based-on: patch by Asan Usipov <asan.usipov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

$(STRIP) always expands to something, because it is one of the commands
in the BRIEF list. This renders the condition pointless.
Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

It is private and must not be touched from outside of lavf.

avconv abuses the API by accessing AVStream.parser (which is private).
Removing AVStream.reference_dts in
2ba68dd0 breaks ABI compatibility for an
old avconv using a newer lavf. Fix this by adding a dummy field until
the next bump.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>