[FFmpeg-cvslog] Merge commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8'
Michael Niedermayer
git at videolan.org
Thu Aug 14 00:11:29 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 14 00:04:42 2014 +0200| [a8db787932ad71ac4f77b61357b695c3b35a283d] | committer: Michael Niedermayer
Merge commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8'
* commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8':
ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8db787932ad71ac4f77b61357b695c3b35a283d
---
More information about the ffmpeg-cvslog
mailing list