Merge commit '2d2a92f72199823a92e4e226c32e42a27ec801c0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 00:07:37 +0000 (01:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 02:31:20 +0000 (03:31 +0100)
commitb7cb77a3228f19e9550f7cb917dc270a553a4fd1
treef5664118ccabe9fef32723a364407eb70ed6e110
parent2d7f20d2bbb1c30686c6a55cca8e3d71832a3a2e
Merge commit '2d2a92f72199823a92e4e226c32e42a27ec801c0'

* commit '2d2a92f72199823a92e4e226c32e42a27ec801c0':
  dxa: use the AVFrame API properly.
  qpeg: use the AVFrame API properly.
  cin video: use the AVFrame API properly.
  msvideo1: use the AVFrame API properly.

Conflicts:
libavcodec/dsicinav.c
libavcodec/dxa.c
libavcodec/msvideo1.c
libavcodec/qpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5219afc09d8e97e18917738cbc052f903df9a619)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsicinav.c
libavcodec/dxa.c
libavcodec/msvideo1.c
libavcodec/qpeg.c