* commit 'b51c7c6b':
  vaapi_h264: Fix frame_num after non-reference frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2bfa067d':
  vaapi_encode: Check config attributes before creating config
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '6641819f':
  build: Ignore generated mapfile and remove it on distclean
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f5c43884':
  FATE: drop the audio stream from the dxtory test
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'fe7b21c8':
  avconv: fix parsing bitstream filters

Not merged because ffmpeg_opt.c still uses the old BSF API.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '80fb19bc':
  avconv: fix a check for av_bsf_get_by_name() return value
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '9f7590f4':
  avconv_vaapi: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Improves compatibility with some MinGW variants,
see 771537ed

* commit '18c506e9':
  avconv_dxva2: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f72db3f2':
  avconv_vdpau: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'b8bf9194':
  hwcontext_vaapi: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '8e70385a':
  hwcontext_dxva2: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2e219b49':
  hwcontext_cuda: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '38392b2a':
  hwcontext_vdpau: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '1c9e8616':
  hwcontext: add a function for opening devices
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '24b5cff0':
  lavc: handle hw_frames_ctx where necessary
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '4024b566':
  golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7ca4fdc0':
  fate: More fine-grained dependencies for demuxer tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '07377fb5':
  fate: More fine-grained dependencies for voice codec tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '3fdffc03':
  rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e47b8bbf':
  avcodec: Bump micro version after changing public JPEG 2000 defines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'ad61da05':
  jpeg2000: Fix profile define values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'ac84e618':
  avfiltergraph: check the query_formats() return value

This commit is a noop, see 6a4c5c73Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2ef6dab0':
  lavc: document that avcodec_close() should not be used
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '04fc8e24':
  lavc: deprecate avcodec_get_context_defaults3()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5f30ac27':
  lavc: deprecate avcodec_copy_context()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '14634429':
  lavf: update muxing doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '74b1bf63':
  mp3: Make the extrasize explicit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '52567e81':
  get_bits: Drop some TRACE-level debug code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e45a638f':
  dump: Drop unused variable
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e2a3df1a':
  avconv: Use more precise deprecation ifdefs

The PSNR functionality is not deprecated in ffmpeg.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '35c85806':
  avconv: stop using AVStream.codec

Not merged, as ffmpeg.c is not migrated to codecpar yet, and this commit
only changes minor parts of AVStream.codec usage, which should get applied
after ffmpeg.c is using codecpar.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes crash due to unprocessed input being passed through

This fixes the last segfault caused by mixing 3.0 and 3.1 libs and
applications
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/h264_sei: Do not skip subsequent SEIs on errors potentially caused by missing parameter sets.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This can also be extended to remove discontiuities caused by seek commands
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>