diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 03:14:30 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 03:14:30 +0400 |
| commit | 32388e04a80139740e495639e3237e99de3b5662 (patch) | |
| tree | 259a3a8559566e17870cfb005a6742d5d601c54c | |
| parent | 4210cbf1937375c1e92a13258333b1af4e1a4371 (diff) | |
| parent | dcbfb7805a655757e0dac2a647dfcd3de0ab0510 (diff) | |
Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'
* commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510':
probe: Support AAC_LATM in set_codec_from_probe_data
Conflicts:
libavformat/utils.c
See: 7bdc5de33d21411e5e742670d669d9908d47a1cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions