diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 15:42:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 15:42:32 +0200 |
| commit | cf7d3846fc865df47bd64f7d4d10bbedf9e3a17b (patch) | |
| tree | 864dea8c658c68cfbded99964a36e0836032f28e /libavformat/au.c | |
| parent | e2e992c077615efbbb539912f242316bd04faa69 (diff) | |
| parent | 9de9b828ef005dec37052548c195a6b4f18fc701 (diff) | |
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>
Diffstat (limited to 'libavformat/au.c')
0 files changed, 0 insertions, 0 deletions