[FFmpeg-cvslog] Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  9 21:44:25 2014 +0200| [8e7c8325d202d7cd59cfab4172760a3a5c3799ed] | committer: Michael Niedermayer

Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
	ffmpeg.c

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

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