[FFmpeg-cvslog] Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'

Michael Niedermayer git at videolan.org
Tue Mar 12 12:55:47 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 12:41:16 2013 +0100| [f9fd6f983b979b2da0f9bba3d6b150a302deb1fe] | committer: Michael Niedermayer

Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'

* commit '2eba9087f3031c6050f8dcd996225490be6c2410':
  lavc: make up a fake frame channel layout when there is no real one.

Conflicts:
	libavcodec/utils.c

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

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





More information about the ffmpeg-cvslog mailing list