ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to