diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-29 15:03:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-29 15:04:56 +0100 |
| commit | b8f5b0713e812ce4ed699eb240a025c88d9ed2c2 (patch) | |
| tree | b88611ca67e1ebb7525db65eccd50c9f9e9be5e1 /libavcodec/libaacplus.c | |
| parent | d840266633c6c56e5abe42cfda997f22678fe7b1 (diff) | |
| parent | 6adf3bc42e36242d487636786e995149bbb849fe (diff) | |
| download | ffmpeg-b8f5b0713e812ce4ed699eb240a025c88d9ed2c2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Add dvd subtitle support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libaacplus.c')
0 files changed, 0 insertions, 0 deletions