ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Aug 23
21:39:14 2014 +0200| [9bff8cfc913e55c2fb0f12be3d7ed06b681166c6] | committer:
Michael Niedermayer
Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'
* commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110':
ogg: Use separate classes for the aliases
Conflicts:
libavformat/oggenc.c
See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bff8cfc913e55c2fb0f12be3d7ed06b681166c6
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
