[FFmpeg-cvslog] Merge commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9'

Michael Niedermayer git at videolan.org
Thu May 30 09:41:54 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 30 09:37:14 2013 +0200| [8ef89833d0a4829cbf471511d191a987f6933bba] | committer: Michael Niedermayer

Merge commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9'

* commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9':
  vmd: return meaningful errors

Conflicts:
	libavcodec/vmdav.c

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

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





More information about the ffmpeg-cvslog mailing list