[FFmpeg-cvslog] Merge commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 12:18:31 2013 +0100| [36685c3c4b03ebe8b5ad6e4ecb1b0227cbe50643] | committer: Michael Niedermayer

Merge commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca'

* commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca':
  lavc: allow decoders to override frame parameters.

Conflicts:
	libavcodec/utils.c

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

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