[FFmpeg-cvslog] Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'
Michael Niedermayer
git at videolan.org
Sat Dec 20 19:24:40 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 19:08:39 2014 +0100| [5318cf521f66cd58642c07e8036f6232d4c60ed2] | committer: Michael Niedermayer
Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'
* commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0':
mpegts: add support for Opus
Conflicts:
libavcodec/opus_parser.c
libavformat/mpegts.c
See: 74141f693ded2fbf75af56fff309d2db35183635
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5318cf521f66cd58642c07e8036f6232d4c60ed2
---
More information about the ffmpeg-cvslog
mailing list