* commit 'bd49be88':
  avconv_vdpau: use the hwcontext API to simplify code

Tested-by: wm4
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

* commit '89923e41':
  lavu: add a framework for handling hwaccel frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '721a4efc':
  buffer: add support for pools using caller data in allocation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'c084d6d2':
  buffersrc: default SAR to 0 (unknown) rather than 1
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'a2bb771a':
  configure: Restore the --enable-everything behaviour
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '5e1beec9':
  configure: Print which libraries will be built
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '21c750f2':
  configure: Use `require` for the non-component options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Following merges make it work as before.

This reverts commit cefad29d.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Use with -use_localtime, and set -hls_segment_filename to a path which
contains a subdirectory i.e. /some/path/%Y%m%d/%Y%m%dT%H%M%S-%s.ts
This will mkdir the %Y%m%d-part of the path if it does not already
exist.
In addition, each filename in the playlist output will be prefixed with
this subdirectory (if playlist and segment shares the same base path).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

correct output pts based on input pts
make seeking possible
output frame one by one on eof
tested with showinfo filter
Suggested-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

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

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

Based on 7c25ffe0 and 58dd885fSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Also remove a tab
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This is not a regression
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '5eb56283':
  mov: Use the correct type for size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '8d34a2f8':
  vdpau: Support for VDPAU accelerated HEVC decoding
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '8958c5c6':
  hevc: Track long and short term RPS size for VDPAU
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '8c399bd5':
  dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e579d8b2':
  lavf: Dump the cpb side data information
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. Ours should be superior.

* commit 'd005ccc6':
  nvenc: rename a misnamed function
  nvenc: merge input and output surface structs
  nvenc: factor out the pixel format list
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit 'fb25d99b':
  buffersrc: do not discard the error from ff_filter_frame()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'f7d77b9a':
  eatqi: Remove MpegEncContext dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '7c25ffe0':
  mpeg1: Make intra-block decoding independent of MpegEncContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '249827f7':
  mpeg12dec: Refactor mpeg1_decode_block_intra()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'cdbaa436':
  mpeg12dec: Always close reader on error
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

* commit '7a00653b':
  tiny_psnr: Support large files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Newer example in blend from f80b4750 is faster and simpler.
Signed-off-by: Lou Logan <lou@lrcd.com>

This commit is a no-op. FFmpeg already has this.

* commit '99214d42':
  dnxhd: Make the encoder message friendlier
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '34c9eba9':
  configure: Refactor toolchain flag setting
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. I don't want to enrange Certain People
who like to --disable-*.

* commit 'dd53af4b':
  avplay: drop support for building without lavfi
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '5781bfae':
  flacenc: Load default prediction_order parameters if none is selected
  asfdec: make sure packet_size is non-zero before seeking
  asfdec: check for too small size in asf_read_unknown
  asfdec: check avio_skip in asf_read_simple_index
  asfdec: break if EOF is reached after asf_read_packet_header
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '389b7984':
  msvc: Fix libx264 linking
  doc: Improve the channelsplit example
  configure: Support MSYS2 mingw-w64 64bit
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e280fe13':
  v210: Use separate sample_factors
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>