Merge commit 'a837c4f2'
* commit 'a837c4f2': zmbvenc: use the AVFrame API properly. flicvideo: use the AVFrame API properly. smacker: use the AVFrame API properly. mmvideo: use the AVFrame API properly. Conflicts: libavcodec/flicvideo.c libavcodec/mmvideo.c libavcodec/smacker.c libavcodec/zmbvenc.c See: 76e27b1d See: 099e57bcMerged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment