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

1 Commits

Author SHA1 Message Date
Paul B Mahol
8dce2dd9cc lavf: Add SMJPEG demuxer. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4209ad6313b8b40fed2bfc7e3865cf54d4c1022)

Conflicts:

	Changelog
	doc/general.texi
	libavformat/version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-03 21:51:53 +01:00