* commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe': avformat_new_stream: make the AVCodec parameter const Conflicts: libavformat/utils.c See: e12cfd044c Merged-by: Michael Niedermayer <michaelni@gmx.at>
e12cfd044c