ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Dec 2
22:39:01 2014 +0100| [d76adfae9cbcdfcfba6a11936feff22f9360dd49] | committer:
Michael Niedermayer
Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'
* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
Add support for BDAV/m2ts-mode muxing
Conflicts:
libavformat/mpegtsenc.c
See: 09a858da7d5535e78e9cf942a468aec411ffbf19
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d76adfae9cbcdfcfba6a11936feff22f9360dd49
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
