Michael Niedermayer 213e82b55c Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517' ...

* commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517':
  yuv4mpegdec: do not set coded_frame properties

Conflicts:
	libavformat/yuv4mpegdec.c

See: b45a3e167f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-05-18 14:02:31 +02:00

12 KiB

Raw Blame History

View Raw