Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 23:14:30 +0000 (01:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 23:14:30 +0000 (01:14 +0200)
* 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>

Trivial merge