Merge commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:25:51 +0000 (18:25 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:37:25 +0000 (18:37 +0100)
commitd3d4bc4784d911236b232e56e4ae476c484381c8
tree05c3b4dade68a91f9c88ccc1a409c16360fe4959
parentde0e219a8aba72de201e85385c746cd1c04be1a2
parent3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4
Merge commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4'

* commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4':
  avconv: set packet duration for CFR video streams

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
ffmpeg.c
tests/ref/fate/g2m2
tests/ref/fate/iff-byterun1
tests/ref/fate/iff-ilbm
tests/ref/fate/mimic
tests/ref/fate/mss2-pal
tests/ref/fate/mss2-pals
tests/ref/fate/mss2-rgb555
tests/ref/fate/mss2-rgb555s
tests/ref/fate/vp9-tiling-pedestrian