* commit 'b9296243':
  mov: Fix the format specifier type for size
Merged-by: Derek 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: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

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

Timo is going to implement this for us.

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

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

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

This commit is a no-op.

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

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

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

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

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

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

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

Signed-off-by: Michael 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: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com>

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

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

This allows to copy information related to the stream ID from the demuxer
to the muxer, thus allowing for example to retain information related to
synchronous and asynchronous KLV data packets. This information is used
in the muxer when remuxing to distinguish the two kind of packets (if the
information is lacking, data packets are considered synchronous).

The fate reference changes are due to the use of
av_packet_merge_side_data(), which increases the size of the output
packet size, since side data is merged into the packet data.

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

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>

Based on 59074310 by Andreas Cadhalpun.
Fixes ticket #5259.

with older versions of libvpx
since:
432be636 lavc/libvpx: Fix support for RGB colorspace.
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: James Zern <jzern@google.com>

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Silences the following warning:
libavfilter/vf_nnedi.c:611:15: warning: assignment discards ‘const’ qualifier from pointer target type

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>

The reference encoder limits it to 64, but testing revealed that there
is absolutely no difference for indices above 50 in amount of zeroed
coefficients.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

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

Also bench a smaller buffer. This drastically reduces --bench runtime
and reports smaller, more readable numbers.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

Commit '842b8f4b' fixed clang/iphone
build but failed on some versions of cygwin. It has now been verified
to work on both platforms.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

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

Improves streaming compatibility with Windows Media Services. Also tested for
compatilbility in Windows Media Player, Windows Media ASF Viewer and VLC.

This version of the patch only writes exclusion among audio streams, therefore
choosing a subtitle language should be possible independently of audio language.
Signed-off-by: Marton Balint <cus@passwd.hu>

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

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

there are no timestamps being set, thus do not attempt to collect any
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>