Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 10:21:24 +0000 (12:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Mar 2015 10:24:33 +0000 (12:24 +0200)
commit97a407f696ae212d53b77ab7e37e0be749e3167e
treef5820416265e0ac901b815f1616e534cbd6eff3f
parent268ff17cb785c3ae94be0aca31ed8709e149b487
parent6fe2641d6e410b7bc203138fa97e1118b411f16d
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@gmx.at>
doc/APIchanges