Michael Niedermayer 94a849b8b6 Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8' ...

* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8':
  dv: use AVFrame API properly

Conflicts:
	libavcodec/dvdec.c

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

2013-12-09 20:10:15 +01:00

3.3 KiB

Raw Blame History

View Raw