* commit '5e91a5c5':
  testsrc: set output framerate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '9df477e0':
  yadif: update frame rate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '1062880d':
  vf_fps: set frame_rate.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '61fb67dc':
  buffersrc: accept the frame rate as argument.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '48ff6683':
  lavfi: add a frame_rate field to AVFilterLink.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '79f5347a':
  avcodec: fix doxy placement
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '8de1ee9f':
  lavf: deprecate compute_pkt_fields2
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

This matches the Libav signature and simplifies merging future changes.

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

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

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

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

If it is negative, it causes segmentation faults in decode_rle.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

ICC versions older than atleast 12.1.6 dont have the tzcnt intrinsics.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Matt Oliver <protogonoi@gmail.com>

Chapter-indexing can be expensive since chapters may be interspersed
throughout the entire file and may require many seeks - especially
costly when consuming a video over a remote protocol like http.
Furthermore it is often unnecessary, especially when only trying to get
video info (e.g. via ffprobe).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Also support disabling them as they seem to cause problems to some
Users. They are also not allowed in IRT D-10 thus the default for
mxf_d10 is not to write them

This also decreases the filesize when no user comment are stored
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

this fixes the return code of avcodec_decode_video2 for gif decoding
and the gif frame data buffer is skipped properly
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

A negative sample rate causes assertion failures in av_rescale_rnd.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

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

Remove loops, output is also more interesting.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

* commit 'aeda1121':
  lavf: factor out freeing an AVStream
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '3efd71b4':
  avconv: set packet duration for CFR video streams
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'a0c71a57':
  lavf: initialize cur_dts to AV_NOPTS_VALUE for muxing
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'cc96018c':
  libopenh264enc: Set AVOption data type
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'fcc49924':
  vdpau: Remove a spurious CONFIG_H263_VDPAU_HWACCEL
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '563e6d86':
  segafilm: drop the "song and dance" for cinepak
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '1e791ee3':
  segafilm: set video and audio stream duration
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c012c6f1':
  segafilm: implement seeking
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2ec112f7':
  vf_pad: fix x, y option expression evaluation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e2854e73':
  avresample: Document avresample_open() a little better
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f128b8e1':
  mov: detect cover art pictures by content
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '50d2a3b5':
  flashsv: Initialize the block array

Not merged, blocks are already zeroed when appropriate.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'de41b555':
  truemotion2: Fix the buffer check
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '4a326923':
  mimic: Always return on failure
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '452d659a':
  msnwc_tcp: Use the correct return values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f8d10511':
  cosmetics: msnwc_tcp: Reformat
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '4dfbc7a7':
  msnwc_tcp: Correctly report failure
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>