Skip to content
Snippets Groups Projects
Commit 5318cf52 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '9cfa68c5' 


* commit '9cfa68c5':
  mpegts: add support for Opus

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

See: 74141f69
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 988ca9bd 9cfa68c5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment