Michael Niedermayer 2b37864e7f Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69' ...

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

Conflicts:
	libavformat/utils.c

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

2014-10-15 18:19:58 +02:00

6.7 KiB

Raw Blame History

View Raw