eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 19:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
37fa4b9bb9672520fa901b69234ac611bbbd133f
ffmpeg/libavformat/matroska.c
Michael Niedermayer 97edb195f4 Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870' 
* commit '141fdc763c2841b572d29a2ad78513e8d5325870':
  matroska: add the Opus mapping

Conflicts:
	libavformat/matroska.c

See: 30549294ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 16:03:30 +02:00

5.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink