Merge commit '5ef11b8dcc054b230deb9b20493255c14a80597d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 15:18:27 +0000 (16:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 15:18:40 +0000 (16:18 +0100)
commit6e2d3ba0eea1592e182d87a3067ff5d485f2f383
tree72bd5b43b6f9bfc2759ddf57ee0b3518191f1160
parent206c06d96f68be737202c0fb554c13fb8b261133
parent5ef11b8dcc054b230deb9b20493255c14a80597d
Merge commit '5ef11b8dcc054b230deb9b20493255c14a80597d'

* commit '5ef11b8dcc054b230deb9b20493255c14a80597d':
  yuv4mpeg: set average frame rate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/yuv4mpeg.c