diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-05 13:34:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-05 13:34:37 +0200 |
| commit | 2230d85cebee829ad773e6bf0873fca98d7bc410 (patch) | |
| tree | b0ee28074d4f16621b6024631bcffe979a96a4f7 /libavcodec/adpcm.c | |
| parent | b042712a875cbbaece4652aa572501a8cbc20051 (diff) | |
| parent | 26b241c0791bfeb9df7b873da4dc74cce0c06be3 (diff) | |
| download | ffmpeg-2230d85cebee829ad773e6bf0873fca98d7bc410.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
matroskaenc: Allow chapters to be written in trailer
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.c')
0 files changed, 0 insertions, 0 deletions