diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 20:37:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 20:39:47 +0200 |
| commit | 8c51ea54897c2d8671b38efecc1422ad4ad344f9 (patch) | |
| tree | 5db81f5cb6c19150fe84252d8636c83c40b140fb /libavformat/omaenc.c | |
| parent | b8044972c4f23e2d2fdf2c5a8ba67019a5045149 (diff) | |
| parent | c831ebf61629d219ebcaa9f02d262e67aad09d83 (diff) | |
| download | ffmpeg-8c51ea54897c2d8671b38efecc1422ad4ad344f9.tar.gz | |
Merge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83'
* commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83':
matroskadec: split frame parsing
matroskadec: split laces parsing
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/omaenc.c')
0 files changed, 0 insertions, 0 deletions