[FFmpeg-cvslog] Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'

Michael Niedermayer git at videolan.org
Wed Oct 15 18:29:15 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 15 16:24:43 2014 +0200| [2b37864e7f2bb78fd78904074f03449f70331e3d] | committer: Michael Niedermayer

Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'

* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
  lavf: switch to AVCodecContext.framerate for demuxing

Conflicts:
	libavformat/utils.c

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

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





More information about the ffmpeg-cvslog mailing list