Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 07:16:13 +0000 (09:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 07:16:13 +0000 (09:16 +0200)
commit045e371cf1f002cf75e9ef7b3e072723473f0c83
tree8f07a0f5185ce2985f6375b376ee3d2332de32d7
parent529ebc90f2423aed54e5534427dc5901a3cc4a60
parent8835c554ff506992c47f6e347c74216ae073f0fa
Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa'

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

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskadec.c