Merge commit '4a4841d4e0f0dc50998511bf6c48b518012024db'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 01:24:27 +0000 (02:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 01:24:27 +0000 (02:24 +0100)
commit4362f272c0ae280cde833589e5c9c6696bd878d5
tree540d690817dfd00dfc28f29a4843d911bd9850bf
parent8af7774c7aca6f3b595d0417b92f543ce0c7b537
parent4a4841d4e0f0dc50998511bf6c48b518012024db
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>
libavcodec/motionpixels.c
libavcodec/rpza.c
libavcodec/vmdav.c