virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity
Files
a46a23d30fea9c8a5570e07ec4d9c9b4eaa6eb4f
FFmpeg/libavcodec/opus_parser.c
Michael Niedermayer 5318cf521f Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0' 
* commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0':
  mpegts: add support for Opus

Conflicts:
	libavcodec/opus_parser.c
	libavformat/mpegts.c

See: 74141f693d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-20 19:15:11 +01:00

5.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink