Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC

This commit is contained in:
Erik Zandvliet 2012-03-12 15:47:44 +01:00
commit 524ae68f11

View file

@ -13,7 +13,7 @@
/// Holds all DDVTECH Stream Container classes and parsers. /// Holds all DDVTECH Stream Container classes and parsers.
///Video: ///Video:
/// - codec (string: AAC, MP3) /// - codec (string: H264, H263, VP6)
/// - width (int, pixels) /// - width (int, pixels)
/// - height (int, pixels) /// - height (int, pixels)
/// - fpks (int, frames per kilosecond (FPS * 1000)) /// - fpks (int, frames per kilosecond (FPS * 1000))
@ -21,7 +21,7 @@
/// - init (string, init data) /// - init (string, init data)
/// ///
///Audio: ///Audio:
/// - codec (string: H264, H263, VP6) /// - codec (string: AAC, MP3)
/// - rate (int, Hz) /// - rate (int, Hz)
/// - size (int, bitsize) /// - size (int, bitsize)
/// - bps (int, bytes per second) /// - bps (int, bytes per second)