[FFmpeg-cvslog] Merge commit '508b37557bf36eae83c18e64d42f27b44a321d81'

Michael Niedermayer git at videolan.org
Sun Nov 17 02:40:29 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 02:33:49 2013 +0100| [72df87088c8a6593d66b207140edd32b4d2fb6ee] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72df87088c8a6593d66b207140edd32b4d2fb6ee
---





More information about the ffmpeg-cvslog mailing list