falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510' 

* 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>
tags/n2.3
Michael Niedermayer 11 years ago
parent
4210cbf193 dcbfb7805a
commit
32388e04a8
Unified View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available