[FFmpeg-cvslog] Merge commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 20 13:30:44 2012 +0200| [1df2e3c707d394ae28159400374ead8d7230f443] | committer: Michael Niedermayer

Merge commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b'

* commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b':
  matroskadec: refactor matroska_decode_buffer

Conflicts:
	libavformat/matroskadec.c

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

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