diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 12:21:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 12:24:33 +0200 |
| commit | 97a407f696ae212d53b77ab7e37e0be749e3167e (patch) | |
| tree | f5820416265e0ac901b815f1616e534cbd6eff3f /libavcodec/pamenc.c | |
| parent | 268ff17cb785c3ae94be0aca31ed8709e149b487 (diff) | |
| parent | 6fe2641d6e410b7bc203138fa97e1118b411f16d (diff) | |
| download | ffmpeg-97a407f696ae212d53b77ab7e37e0be749e3167e.tar.gz | |
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>
Diffstat (limited to 'libavcodec/pamenc.c')
0 files changed, 0 insertions, 0 deletions