Michael Niedermayer 4362f272c0 Merge commit '4a4841d4e0f0dc50998511bf6c48b518012024db' ...

* commit '4a4841d4e0f0dc50998511bf6c48b518012024db':
  fraps: use the AVFrame API properly.
  rpza: use the AVFrame API properly.
  motionpixels: use the AVFrame API properly.
  vmdvideo: use the AVFrame API properly.

Conflicts:
	libavcodec/fraps.c
	libavcodec/motionpixels.c
	libavcodec/rpza.c
	libavcodec/vmdav.c

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

2013-11-17 02:24:27 +01:00

11 KiB

Raw Blame History

View Raw