Merge commit '
508b37557bf36eae83c18e64d42f27b44a321d81'
* commit '
508b37557bf36eae83c18e64d42f27b44a321d81':
tiertexseqv: use the AVFrame API properly.
smc: use the AVFrame API properly.
truemotion2: use the AVFrame API properly.
truemotion1: use the AVFrame API properly.
Conflicts:
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
See:
e999f2339ab0200039ee7123b75d79a52aaac5d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
72df87088c8a6593d66b207140edd32b4d2fb6ee)
Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>