[FFmpeg-cvslog] Merge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 20 20:37:26 2012 +0200| [8c51ea54897c2d8671b38efecc1422ad4ad344f9] | committer: Michael Niedermayer

Merge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83'

* commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83':
  matroskadec: split frame parsing
  matroskadec: split laces parsing

Conflicts:
	libavformat/matroskadec.c

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

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