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 'a7b3216cbdc7796a9d14cd22a863fae3556098ba' 

* commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba':
  doc: Sort the muxer documentation

Conflicts:
	doc/muxers.texi

No change as ours was already sorted

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
0a30ad3473 a7b3216cbd
commit
ca5b45b9b3
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available