-
Michael Niedermayer authored
* commit 'b9b68955': img2dec: check av_new_packet return value Conflicts: libavformat/img2dec.c See: 3f814891Merged-by:
Michael Niedermayer <michaelni@gmx.at>
324797eb
* commit 'b9b68955': img2dec: check av_new_packet return value Conflicts: libavformat/img2dec.c See: 3f814891Merged-by:Michael Niedermayer <michaelni@gmx.at>