[FFmpeg-cvslog] Merge commit '9de9b828ef005dec37052548c195a6b4f18fc701'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 15:42:32 2013 +0200| [cf7d3846fc865df47bd64f7d4d10bbedf9e3a17b] | committer: Michael Niedermayer

Merge commit '9de9b828ef005dec37052548c195a6b4f18fc701'

* commit '9de9b828ef005dec37052548c195a6b4f18fc701':
  lavc: don't overwrite display dimensions with coded dimensions.
  lavc: extend / update the [coded_]{width,height} doxy

Conflicts:
	libavcodec/avcodec.h
	libavcodec/utils.c

The change to the w/h handling is not merged as it breaks lowres

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

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