Merge commit '3a6dfec8'
* commit '3a6dfec8': 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>
Showing
Please
register
or
sign in
to comment