diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:16:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:16:13 +0200 |
| commit | 045e371cf1f002cf75e9ef7b3e072723473f0c83 (patch) | |
| tree | 8f07a0f5185ce2985f6375b376ee3d2332de32d7 /.gitignore | |
| parent | 529ebc90f2423aed54e5534427dc5901a3cc4a60 (diff) | |
| parent | 8835c554ff506992c47f6e347c74216ae073f0fa (diff) | |
| download | ffmpeg-045e371cf1f002cf75e9ef7b3e072723473f0c83.tar.gz | |
Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa'
* commit '8835c554ff506992c47f6e347c74216ae073f0fa':
matroskadec: introduce resync function.
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions