Commit a915b1da authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0c00e734 3a6dfec8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment