* commit '73ff983e':
  fft: x86: cosmetics: Drop silly comments, add comment, whitespace
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'ce9d7da7':
  qsv: Move down the implementation query
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'dbb43b8b':
  avpacket: properly reset data/size in av_packet_move_ref()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'ba357e98':
  avprobe: switch to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

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

Signed-off-by: Lou Logan <lou@lrcd.com>

doc/examples/muxing: Add support to pass flags to muxer as since codecpar the codec flags are not available to the muxer anymore
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '567d6d5f':
  avprobe: add local per-stream state
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'c9478410':
  avprobe: add local per-file state
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'c80344d0':
  mpegvideo_enc: use avcodec_free_context() instead of av_free()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '168a443d':
  avprobe: print information from the codec descriptor
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e7188a1a':
  avprobe: remove a pointless condition and a dead branch
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit 'dc4983d7':
  APIchanges: add missing hashes and dates
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '3e8fd93b':
  lavf: add a missing bump and APIchanges for the codecpar switch
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e66fa353':
  vc1dec: Check group allocations separatedly
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. We already did this.

* commit '01f0e6a0':
  vc1dec: Fix leak on error for array allocations
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'f91d94bd':
  vc1dec: Properly call deinit function on error
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '35b1cd34':
  vc1dec: Drop commented out cruft
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'fa55addd':
  img2: Drop av_ prefix for a static function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit 'd6e49096':
  idct: Only build prores IDCT if ProRes decoder is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '3c53627a':
  qsvdec: store the sync point in heap memory
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'a1335149':
  qsvenc: store the sync point in heap memory
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '1138eb55':
  vsrc_movie: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'ac6d5358':
  examples/transcode_aac: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'a9e1f2cc':
  examples/qsvdec: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9897d9f4':
  examples/output: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

This is needed as the bitexact flag is not in the codecpar context, and thus not copied
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This is needed as the bitexact flag is not in the codecpar context, and thus not copied
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This is needed as the bitexact flag is not in the codecpar context, and thus not copied
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

This commit is a no-op. We want to do this ourselves since avplay and
ffplay differ quite a bit.

* commit 'c23152a9':
  avplay: convert do codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. We did this already in 9e0d1c00.

* commit '0705f596':
  avplay: do not use AVStream.codec for decoding
Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>

This commit is a no-op. We want to do this ourselves, since avconv and ffmpeg
differ quite a bit.

* commit '15e84ed3':
  avconv: convert to codecpar
Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>

This commit is a no-op. We already moved it here.

* commit '5b9cdf8c':
  avconv: switch opening decoders and encoders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>