aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/smc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-17 02:24:27 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-17 02:24:27 +0100
commit4362f272c0ae280cde833589e5c9c6696bd878d5 (patch)
tree540d690817dfd00dfc28f29a4843d911bd9850bf /libavcodec/smc.c
parent8af7774c7aca6f3b595d0417b92f543ce0c7b537 (diff)
parent4a4841d4e0f0dc50998511bf6c48b518012024db (diff)
downloadffmpeg-4362f272c0ae280cde833589e5c9c6696bd878d5.tar.gz
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>
Diffstat (limited to 'libavcodec/smc.c')
0 files changed, 0 insertions, 0 deletions