Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:30:43 +0000 (14:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:38:36 +0000 (14:38 +0200)
commit8334850a9985dde0e11227902fb007b382aa97e6
tree1d3e645a286dc2bc3280146c1751b7a6ec768f74
parent8636b11bdc6ecd7c486d3463a7dcb22b0c0a9ba7
parent93afb6c98df876b15e3d911a9450ad55f92080ce
Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'

* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
  avconv: set output avg_frame_rate when known

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
tests/ref/lavf/wtv