* commit '8caadfc5':
  fate: Be silent when switching to Git branch
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '8d918a98':
  rtpdec: Use the right logging context
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'd24bd96b':
  build: Disentangle VC-1 decoder and parser
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '15a24614':
  build: Add vc1dsp component for more fine-grained dependencies
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'f9fbd474':
  msmpeg4data: Move WMV2 data tables to their own file
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '79866803':
  msmpeg4data: K&R formatting cosmetics
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'b10c33c5':
  build: Add missing mpegvideo dependency for the MSS2 and VC-1 decoders
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '7d16d853':
  build: More precise dependencies for h264dsp
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

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

* commit 'f273f7fb':
  mkv: Force the full parsing of mp3
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '3ef98937':
  mov: Force the full parsing of mp3
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

We have already reverted the configure changes, and we do not have a typo
in configure.

* commit 'b4a0f172':
  Revert all recent configure changes related to dependency resolution
  build: Fix typo in HEVC VDPAU hwaccel dependencies
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '0d1229f1':
  voc: Split ff_voc_get_packet into a separate file
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '624e2355':
  build: Introduce iso_media component
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '82454c3a':
  build: Let the WTV demuxer select the MPEG-TS demuxer
  build: Adjust mpeg4video parser dependencies
  build: Fix mpegvideo component dependencies
  build: Fix dependencies for components relying on H.263 data tables
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e4531293':
  build: Add missing dependencies for eatqi decoder
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '71eaefa6':
  build: Add missing celp_math dependency for G723_1 encoder and decoder
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '7c82d31c':
  checkasm: Use standard multiple inclusion guards
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '3d8025d6':
  profiles: Add missing #endif comment
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '6b96d2dc':
  cosmetics: Drop particularly redundant silly comments
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '29c2d06d':
  cosmetics: Drop empty comment lines
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'd847a408':
  hwcontext_cuda/vdpau: add to skipheaders
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9c0bc1e9':
  qsv: add a missing #include
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'b9296243':
  mov: Fix the format specifier type for size
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

This is a no-op. This was a part of the already-reverted
broken configure saga.

* commit '2edc7187':
  configure: Relax the implication of --enable for components
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '47570dbd':
  fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'c15f6098':
  avconv: pass the hw context from filters to the encoder
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

Timo is going to implement this for us.

* commit '871d0930':
  nvenc: support CUDA frames as input
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '7b3214d0':
  lavc: add a field for passing AVHWFramesContext to encoders
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '21f7cd4a':
  lavfi: add a filter for uploading normal frames to CUDA
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '1bf34134':
  avconv: use the new buffersrc parameters API
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'b3dd30db':
  lavfi: pass the hw frames context through the filter chain
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'ad884d10':
  hwcontext: add a CUDA implementation
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '7bc780cd':
  pixfmt: add a CUDA hwaccelled format
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

This currently doesn't do anything, but will be used later for hwaccel
filters and libavutil.
Signed-off-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

There can be multiple SOS markers, so do not return 0 in that case.
Signed-off-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. We already have such functionality.

* commit 'c51b2c79':
  Allow linking to CUDA dynamically instead of dlopen()ing it at runtime
Merged-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

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

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

Doing slice_end - slice_start is unsafe and can lead to undefined behavior
until slice_end has been properly sanitized.
Reviewed-by: NRonald S. Bultje <rsbultje@gmail.com>
Signed-off-by: NGanesh Ajjanagadde <gajjanag@gmail.com>

Fixes part of Ticket5264
Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>