-
Michael Niedermayer authored
Signed-off-by:
Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b750b67d) Conflicts: libavformat/img2dec.c
8ed4b446
Signed-off-by:Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b750b67d) Conflicts: libavformat/img2dec.c