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 '31e558fbcfec8fa9fddf564ab8360384706e41c0' 

* commit '31e558fbcfec8fa9fddf564ab8360384706e41c0':
  isom: add "NO16" FourCC

Conflicts:
	libavformat/isom.c

See: 96e2507363
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 12 years ago
parent
2030b3a4ab 31e558fbcf
commit
d32245e5b1
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available