eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-04 21:25:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ae658efef86b932484a88c52dc9b803bb5d99e3d
ffmpeg/libavformat/mpegtsenc.c
Michael Niedermayer d76adfae9c Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550' 
* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
  Add support for BDAV/m2ts-mode muxing

Conflicts:
	libavformat/mpegtsenc.c

See: 09a858da7d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 22:42:35 +01:00

51 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink