diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 02:24:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 03:32:03 +0100 |
| commit | 8c53cacbfd3299d9a74202102b32cfd4212d779f (patch) | |
| tree | 984af6417f0fe82a4d2c5f542200781c7528bb32 /doc/mips.txt | |
| parent | dcb91e3dfe077c3ac0717b24288834d851312e04 (diff) | |
| download | ffmpeg-8c53cacbfd3299d9a74202102b32cfd4212d779f.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>
(cherry picked from commit 4362f272c0ae280cde833589e5c9c6696bd878d5)
Conflicts:
libavcodec/vmdav.c
Author of the merged code: Anton Khirnov
Diffstat (limited to 'doc/mips.txt')
0 files changed, 0 insertions, 0 deletions