generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,724 Commits 24 Branches 241 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer
5297003aa7 Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' 
* commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
  LucasArts SMUSH demuxer

Conflicts:
	Changelog
	doc/general.texi
	libavformat/smush.c
	libavformat/version.h

See: bef8fd7099edfac9c487e6eb75d7e6116ad80465
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 23:29:47 +02:00
Paul B Mahol
4cdff58206 fate: add tests for SANM and VIMA 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-22 00:16:03 +00:00