highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e03cb1e115b41f8087c91d62e39c3965fc3b9a11
ffmpeg/libavformat/mpegts.c
Michael Niedermayer 088b410ea2 Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258' 
* commit '42bc768e5240ec01237ad2eb7c69b917158de258':
  mpegts: Add jpeg2000 stream type

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 13:08:26 +02:00

93 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink