* commit 'ccea588f':
  avio: Add an option 'rw_timeout'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'd44f3e40':
  avio: Apply avoptions on the URLContext itself as well
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '8a02a803':
  lavfi: add an NVIDIA NPP-based scaling filter
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '98114d70':
  lavf: VAAPI scale filter
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. wm4 is working to get these into ffmpeg
proper, with ffmpeg versions of the patches.

* commit '8bc4accc':
  lavf: use new decode API
  avconv: use new encode API
  avconv: use new decode API
  lavc: introduce a new decoding/encoding API with decoupled input/output
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

These commits are no-ops. Not going to merge these since our opt
tests are more complex, and have several blocks with different
options.

* commit '0d2fcdb1':
  opt-test: Merge struct declaration and initialization
  opt-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

broken since af9cac1bSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

broken since af9cac1bSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes ffmpeg ... -vbsf noise=234 ...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Found by Moritz Barsnick

Add number of input and output frames to possible variables.
Add option eval to reevaluate coordinate expressions during
initialization or for every frame.

This commit is a no-op.

* commit 'a84713e7':
  parseutils-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '52385410':
  des-test: Move a variable declaration to avoid an ifdef
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '65a80240':
  build: Add component for the SRTP common code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '30e9ef21':
  timefilter-test: Only compile timefilter-test if JACK is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '48362cea':
  doc: Update paths to match new examples location
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '8dead2aa':
  Move const qualifier before type name
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'd909f43b':
  vc1dec: wmv2dec: Validate ff_intrax8_common_init return value
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '0372e73f':
  intrax8: Check and propagate errors from ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'ad8aa8e6':
  intrax8: Move documentation from implementation to header file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '2ade1cda':
  intrax8: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '6f5ff559':
  intrax8: Adjust printf conversion specifier for sizeof expression
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '42244ce0':
  intrax8: Move a comment to the place it corresponds
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '75056254':
  intrax8: Wrap multiline macros in do{}while(0) clauses
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '0c6a7087':
  intrax8: Move error resilience out of intrax8
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '709c0f79':
  nuv: Use the correct context for av_image_check_size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '64250d94':
  indeo4: Consistently initialize variables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '6202e2fe':
  indeo4: Rework stream analysis report
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. We will do this when we convert ffmpeg.c

* commit '4426540f':
  avconv: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '33d18982':
  lavc: add a new bitstream filtering API
Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avfilter/vf_readvitc: Use avpriv_frame_get_metadatap() avoid direct access to AVFrame.metadata (to comply to API)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reproduces a bug to remain consistent with libvpx' behaviour.

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

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

Sometimes video fails to decode if H.264 configuration changes mid stream.
The reason is that configuration parser assumes that nal_ref_idc is equal to 11b
while actually some codecs but 01b there. The H.264 spec is somewhat
vague about this but it looks like it allows any non-zero nal_ref_idc for sps/pps.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

It was accidentally deleted in the previous hashenc commit
Signed-off-by: James Almer <jamrial@gmail.com>

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