-
Michael Niedermayer authored
* commit 'd4f1188d': dv: use AVFrame API properly Conflicts: libavcodec/dvdec.c Merged-by:
Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 94a849b8) Conflicts: libavcodec/dv.h libavcodec/dvdec.c libavcodec/dvenc.c Author of the merged code: Anton Khirnov
9f864bd3