[FFmpeg-cvslog] Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d'

Michael Niedermayer git at videolan.org
Sun Mar 29 12:40:00 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 29 12:21:24 2015 +0200| [97a407f696ae212d53b77ab7e37e0be749e3167e] | committer: Michael Niedermayer

Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d'

* commit '6fe2641d6e410b7bc203138fa97e1118b411f16d':
  lavc: add profile define for DTS Express

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list