diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 22:56:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 22:56:52 +0100 |
| commit | cc598bf7dc8a4b0970b5c654de33706c03dac611 (patch) | |
| tree | 8765db3ea2ccc3c77b3927b6e392e6ef98979c9c /libavformat/rm.h | |
| parent | dd4adba8112bc972ac6bf4147f7ab3cea4d5a105 (diff) | |
| parent | f6c82b34a320f105af266997f5951cbe7dfc8a05 (diff) | |
| download | ffmpeg-cc598bf7dc8a4b0970b5c654de33706c03dac611.tar.gz | |
Merge commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05' into release/2.4
* commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05':
segment: Fix the failure paths
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rm.h')
0 files changed, 0 insertions, 0 deletions