Merge commit 'f7986239f4dbec91c743c4c5eb0a2339bd325bf6'
[ffmpeg.git] / libavformat / smjpeg.h
2012-06-29 Paul B MaholReplace Libav with FFmpeg in license headers for files...
2012-01-16 Paul B Maholavformat: split out common SMJPEG code