Merge commit '3d90f27a'
* commit '3d90f27a': avformat_new_stream: make the AVCodec parameter const Conflicts: libavformat/utils.c See: e12cfd04Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment