[FFmpeg-cvslog] Merge commit '19b9659f3174599e8685d329c4330b1ea8c4c6db'

Michael Niedermayer git at videolan.org
Tue Sep 17 15:55:56 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 15:50:21 2013 +0200| [a1fb3e512778ed940ce754b8e70c4dd99109c1e2] | committer: Michael Niedermayer

Merge commit '19b9659f3174599e8685d329c4330b1ea8c4c6db'

* commit '19b9659f3174599e8685d329c4330b1ea8c4c6db':
  oggparseogm: Convert to use bytestream2

Conflicts:
	libavformat/oggparseogm.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1fb3e512778ed940ce754b8e70c4dd99109c1e2
---





More information about the ffmpeg-cvslog mailing list