Merge commit 'd1d9efaa'
* commit 'd1d9efaa': avcodec: split avpicture from imgconvert pixdesc: add PIX_FMT_ALPHA flag Conflicts: libavcodec/imgconvert.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
libavcodec/avpicture.c
0 → 100644
Please
register
or
sign in
to comment