-
Michael Niedermayer authored
* commit 'b513bf6f': yuv4mpegdec: do not set coded_frame properties Conflicts: libavformat/yuv4mpegdec.c See: b45a3e16Merged-by: Michael Niedermayer <michaelni@gmx.at>
213e82b5
* commit 'b513bf6f': yuv4mpegdec: do not set coded_frame properties Conflicts: libavformat/yuv4mpegdec.c See: b45a3e16Merged-by: Michael Niedermayer <michaelni@gmx.at>