Michael Niedermayer 72df87088c 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: e999f2339a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-11-17 02:35:23 +01:00

7.7 KiB

Raw Blame History

View Raw