[FFmpeg-cvslog] Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 11 09:16:13 2013 +0200| [045e371cf1f002cf75e9ef7b3e072723473f0c83] | committer: Michael Niedermayer

Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa'

* commit '8835c554ff506992c47f6e347c74216ae073f0fa':
  matroskadec: introduce resync function.

Conflicts:
	libavformat/matroskadec.c

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

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