Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 19:06:39 +0000 (20:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 19:10:15 +0000 (20:10 +0100)
commit94a849b8b6c3e4a90361485b2e12a9a5c35833a3
tree703f7ceb7760983dc163120399bd67540b7ca126
parent785066ae8aaf0c241fb94c74fadf61ae62c34530
parentd4f1188d1a662fed5347e70016da49e01563e8a8
Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'

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

Conflicts:
libavcodec/dvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dvdec.c
libavcodec/dvenc.c