eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-24 16:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
d22e88d120ebaff40d25a5872b75d69e2ced5a61
ffmpeg/libavformat/oggenc.c
Michael Niedermayer 9bff8cfc91 Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110' 
* commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110':
  ogg: Use separate classes for the aliases

Conflicts:
	libavformat/oggenc.c

See: 2ccc6ff03a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-23 21:42:13 +02:00

24 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink