Commit 70b423e1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3d90f27a'

* commit '3d90f27a':
  avformat_new_stream: make the AVCodec parameter const

Conflicts:
	libavformat/utils.c

See: e12cfd04Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e1f729d9 3d90f27a
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment