[FFmpeg-cvslog] Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 15 18:47:44 2014 +0200| [137f7a630b5f91d6baa74a75cca8dd920107c4c6] | committer: Michael Niedermayer

Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'

* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a':
  avconv: replace AVCodecContext.time_base with framerate

Conflicts:
	ffmpeg.c

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

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