Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'

Browse Source

* commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510':
  probe: Support AAC_LATM in set_codec_from_probe_data

Conflicts:
	libavformat/utils.c

See: 7bdc5de33d
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2014-05-04 01:14:30 +02:00

parent 4210cbf193 dcbfb7805a

commit 32388e04a8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available