[FFmpeg-cvslog] Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'

Michael Niedermayer git at videolan.org
Sat Mar 8 00:21:04 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  8 00:13:20 2014 +0100| [fabf69f37abe1560c85d6483f75849014da2971e] | committer: Michael Niedermayer

Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'

* commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Conflicts:
	libavformat/matroskadec.c

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

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





More information about the ffmpeg-cvslog mailing list