Michael Niedermayer 5219afc09d 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>

2013-11-17 01:07:37 +01:00

14 KiB

Raw Blame History

View Raw