ekr 61f1bac9ff Merge pull request #119 from sijchen/merge6 ... complete the encoder interface of bit rate and frame rate updating		2014-01-08 17:39:08 -08:00
..
asm	resolve conflict	2014-01-03 14:49:45 +08:00
inc	Merge pull request #119 from sijchen/merge6	2014-01-08 17:39:08 -08:00
src	Merge pull request #119 from sijchen/merge6	2014-01-08 17:39:08 -08:00