diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 14:04:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 14:05:09 +0100 |
| commit | 3fac99cd9d002423a746522736f93742c84df018 (patch) | |
| tree | 507fd36cdd9c73d5f28c55773a293bb63f09d881 /libavcodec/amr.h | |
| parent | d98aa7cdc19b6392ab3a29b11305104338166ddc (diff) | |
| parent | 981cf0c300037950be2ed20505ff8b20e7a53224 (diff) | |
| download | ffmpeg-3fac99cd9d002423a746522736f93742c84df018.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
movenc: Do not flag secondary audio and subtitle tracks as enabled.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amr.h')
0 files changed, 0 insertions, 0 deletions