Merge commit 'ae3822bc'

* commit 'ae3822bc': imgconvert: remove PixFmtInfo Conflicts: libavcodec/imgconvert.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ae3822bc'
* commit 'ae3822bc': imgconvert: remove PixFmtInfo Conflicts: libavcodec/imgconvert.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
b044e81f · Michael Niedermayer · 6ff544e4 · ae3822bc · b044e81f
Commit b044e81f authored Nov 21, 2012 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 375 deletions

imgconvert.c libavcodec/imgconvert.c +15 -375

No files found.
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c