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

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

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

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

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

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

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

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

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

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

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

Fixes ticket #2579.

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

This fixes checking a variable that had been overwritten before.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  ac3dec: fix outptr increment.

Conflicts:
	libavcodec/ac3dec.c

No change as this has been fixed in ffmpeg head already
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a1c5cc42':
  lavc: don't set AVFrame.pts to random numbers in decoders.

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

* commit '2ba68dd0':
  lavf: remove unreliable timestamp guessing heuristic

Conflicts:
	libavformat/utils.c

Not merged, as the change breaks ABI by removing a field from the middle
of AVStream.
Also, if you have files that decode better or worse without this code please
open a ticket on trac. If the timestamp code turns out useless it of course
should be removed.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes corrupt data errors when downmixing in the AC-3 decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

CC:libav-stable@libav.org

* commit 'f2521563':
  g722dec: Change bits_per_codeword to the right option type
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '884c7a6e':
  avfilter: fix const use of avfilter_next

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

* commit '5c439b41':
  avfilter: have avfilter_get_by_name return const for next bump

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

* commit '97de206b':
  lavc: disable CRC checking by default

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

* commit '23a211cb':
  lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.

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

* commit 'f354f308':
  error resilience: check error_concealment, not err_recognition.

Conflicts:
	libavcodec/error_resilience.c

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

* commit '53151723':
  avio: K&R formatting cosmetics

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

* commit 'aaaf2dc0':
  h263: Check init_get_bits return value

Conflicts:
	libavcodec/h263dec.c

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

* commit '07493148':
  h263: Return meaningful errors

Conflicts:
	libavcodec/h263dec.c

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

* commit 'de606120':
  configure: Disable -Wmaybe-uninitialized by default
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0b357a80':
  AVOptions: do not range check flag options.

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

* commit '94603feb':
  h264_ps: when parsing a VUI fails, only abort when explode is set

Merge only for metadata, ignoring invalid data can put the context
into an invalid state and can possibly be used for remote code
execution exploits.
Also we support all non standard VUIs that have been reported so
ignoring parsing failure makes no sense for us unless theres
some issue that has not been reported
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '79ef4b19':
  FATE: add bitexact sws flags to the fieldorder test

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

* commit 'ddc589ce':
  avconv: drop a now useless variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

* commit '529a9893':
  avframe: mark source frame const in _ref and _clone
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fc06ee6e':
  mmvideo: fix uninitialized variable use in mm_decode_intra

Conflicts:
	libavcodec/mmvideo.c

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

* commit '211ca69b':
  lavr: check that current_buffer is not NULL before using it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fix warning:
In file included from ffprobe.c:2557:0:
cmdutils_common_opts.h:17:5: warning: initialization from incompatible pointer type [enabled by default]
cmdutils_common_opts.h:17:5: warning: (near initialization for ‘real_options[16].u.func_arg’) [enabled by default]

Spotted-by: Paul B Mahol