[FFmpeg-cvslog] Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 14:30:43 2014 +0200| [8334850a9985dde0e11227902fb007b382aa97e6] | committer: Michael Niedermayer

Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'

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

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8334850a9985dde0e11227902fb007b382aa97e6
---