[FFmpeg-cvslog] Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 20:06:39 2013 +0100| [94a849b8b6c3e4a90361485b2e12a9a5c35833a3] | committer: Michael Niedermayer

Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'

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

Conflicts:
	libavcodec/dvdec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94a849b8b6c3e4a90361485b2e12a9a5c35833a3
---