diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-23 22:53:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-23 23:16:03 +0100 |
| commit | a915b1daee3ba99306d79100d5e973549b48a891 (patch) | |
| tree | 6a7ff511ba2de020b91c618624313a55387ff7f9 /libavcodec | |
| parent | 0c00e734ef2b1cac83cf71f331bdb0f6e504de23 (diff) | |
| parent | 3a6dfec864d569c2d0a875e1a7466f51b00edb63 (diff) | |
| download | ffmpeg-a915b1daee3ba99306d79100d5e973549b48a891.tar.gz | |
Merge commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63'
* commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63':
segment: Check av_get_frame_filename() return value
Conflicts:
libavformat/segment.c
No changes as there was no unchecked av_get_frame_filename() in segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions