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 'da35008c314eae5a10a8c070f5185b7694c0a37e' into release/2.4 

* commit 'da35008c314eae5a10a8c070f5185b7694c0a37e':
  latm: Do not give a score for a single instance

Conflicts:
	libavformat/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.7
Michael Niedermayer 11 years ago
parent
705e0e0513 da35008c31
commit
1dc53463d9
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available