Merge commit '2d6e5849'
* commit '2d6e5849': lavf: switch to AVCodecContext.framerate for demuxing Conflicts: libavformat/utils.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '2d6e5849': lavf: switch to AVCodecContext.framerate for demuxing Conflicts: libavformat/utils.c Merged-by:Michael Niedermayer <michaelni@gmx.at>