OSDN Git Service

Merge commit '508b37557bf36eae83c18e64d42f27b44a321d81'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 01:33:49 +0000 (02:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 02:32:08 +0000 (03:32 +0100)
commitdbb4ff685135a39f37224fd9e85bbf59c215c6d1
tree9cfdb9351c032679e7eb196f741f92b0a6c4d43d
parent8c53cacbfd3299d9a74202102b32cfd4212d779f
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>
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c