diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 11:44:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 11:44:25 +0200 |
| commit | e1acfd3cb0543815316ede06232d13e002562daa (patch) | |
| tree | ae93002655c896f4873bd1a5fa8d6f22e0659cef /libavcodec/adx.c | |
| parent | d169b56b7bfc44c80261b7a2ec74f279cd853966 (diff) | |
| parent | b886f5c2f1e71b3e60e4265c500158d392b4b9a4 (diff) | |
| download | ffmpeg-e1acfd3cb0543815316ede06232d13e002562daa.tar.gz | |
Merge commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4'
* commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4':
mkv: Allow flushing the current cluster in progress
Conflicts:
libavformat/matroskaenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adx.c')
0 files changed, 0 insertions, 0 deletions