diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 22:15:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 22:15:45 +0100 |
| commit | 2a741baeff359aa7e8a5bb2c1a225d6ac9cf10ee (patch) | |
| tree | ea6297f44cdb93006755af33888e70ac976f9143 /libavformat/srtenc.c | |
| parent | 86e7d20ac2e7cfd6385f84e78117058c1ea0882f (diff) | |
| parent | b3f04657368a32a9903406395f865e230b1de348 (diff) | |
| download | ffmpeg-2a741baeff359aa7e8a5bb2c1a225d6ac9cf10ee.tar.gz | |
Merge commit 'b3f04657368a32a9903406395f865e230b1de348'
* commit 'b3f04657368a32a9903406395f865e230b1de348':
segment: Fix the failure paths
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtenc.c')
0 files changed, 0 insertions, 0 deletions