diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-02 16:14:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-02 16:14:21 +0100 |
| commit | 4be0b9109421b87f049cab9aa8f46d94f5403c08 (patch) | |
| tree | 0c4b8e9a35b616d473522b8104ab2f6841fb0393 /libavformat/matroska.c | |
| parent | 6d9c21dc0e82130bcd57f77c5ba11d260075a004 (diff) | |
| parent | 4ea7fbb2ec1a8833b6683655b98f4bf42f817102 (diff) | |
| download | ffmpeg-4be0b9109421b87f049cab9aa8f46d94f5403c08.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: step to next frame if paused when seeking
ffplay: move up pause functions
ffplay: remember last window dimensions
ffplay: fix order of setting show_mode
ffplay: dynamically allocate audio buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.c')
0 files changed, 0 insertions, 0 deletions