Changeset 32388e0 in ffmpeg

Timestamp:

May 3, 2014, 11:14:30 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8b132bb7

Parents:

4210cbf (diff), dcbfb780 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)