Merge commit '508b37557bf36eae83c18e64d42f27b44a321d81'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 01:33:49 +0000 (02:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 01:35:23 +0000 (02:35 +0100)
commit72df87088c8a6593d66b207140edd32b4d2fb6ee
tree627f4074de47307e4d22564f82ee85f614a44e09
parent4362f272c0ae280cde833589e5c9c6696bd878d5
parent508b37557bf36eae83c18e64d42f27b44a321d81
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>
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c