[FFmpeg-cvslog] Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'

Michael Niedermayer git at videolan.org
Sun Feb 16 02:25:05 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 16 02:18:58 2014 +0100| [1db87da35141c34474644c677bad2cf3a408611d] | committer: Michael Niedermayer

Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'

* commit '9cd4bc41760f8ad879e248920eacbe1e7757152c':
  ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

Conflicts:
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list