Michael Niedermayer cf7d3846fc 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@gmx.at>

2013-04-11 15:42:32 +02:00

159 KiB

Raw Blame History

View Raw