[FFmpeg-cvslog] Merge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  8 14:27:52 2014 +0200| [70b423e1484f178c40f04b6040349a08aff31f96] | committer: Michael Niedermayer

Merge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe'

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

Conflicts:
	libavformat/utils.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70b423e1484f178c40f04b6040349a08aff31f96
---