1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-03 16:24:53 +02:00
Files
FFmpeg/libavcodec
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
..
2014-12-18 16:10:23 +01:00
2014-11-30 12:56:02 +01:00
2014-12-18 23:22:59 +01:00
2014-12-18 23:27:14 +01:00
2014-11-21 17:13:56 +01:00
2014-12-08 13:29:18 +00:00
2014-11-26 04:11:16 +01:00
2014-12-18 03:45:59 +01:00
2014-11-25 02:00:06 +00:00
2014-12-18 23:22:59 +01:00
2014-12-11 01:06:27 +01:00
2014-12-20 11:29:19 +01:00
2014-12-20 11:29:19 +01:00
2014-12-03 11:56:22 +01:00
2014-12-18 23:51:07 +01:00
2014-11-16 23:48:38 +01:00
2014-11-25 02:00:27 +01:00
2014-11-16 23:48:38 +01:00
2014-11-16 23:48:38 +01:00
2014-12-01 00:31:06 +01:00
2014-12-19 20:53:53 +01:00