-
Michael Niedermayer authored
* commit 'ab72eda1': pixfmt: mark the reserved values Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
faa1d4b1
* commit 'ab72eda1': pixfmt: mark the reserved values Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>