[FFmpeg-cvslog] Merge commit '4a4841d4e0f0dc50998511bf6c48b518012024db'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 02:24:27 2013 +0100| [4362f272c0ae280cde833589e5c9c6696bd878d5] | committer: Michael Niedermayer

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 at gmx.at>

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