Changelog · 5cf84e595d7ce671c185af8b69d68b77fab1ca0c · libremedia / Tethys / FFmpeg · GitLab

Snippets Groups Projects

9 years ago

Merge commit '' · 8985e7c5

Michael Niedermayer authored 9 years ago


* commit '9b56ac74':
  mpjpeg: Initial implementation

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

8985e7c5

Merge commit ''

Michael Niedermayer authored 9 years ago


* commit '9b56ac74':
  mpjpeg: Initial implementation

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

To find the state of this project's repository at the time of any of these versions, check out the tags.