[FFmpeg-cvslog] Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'

Michael Niedermayer git at videolan.org
Fri Mar 8 20:40:27 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  8 20:18:45 2013 +0100| [c4e8821732999f720535bb2eb1e8c7f1ea1db18f] | committer: Michael Niedermayer

Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'

* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
  Move AVFrame from lavc to lavu.

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list