Merge commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Jan 2015 21:53:25 +0000 (22:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Jan 2015 22:16:03 +0000 (23:16 +0100)
commita915b1daee3ba99306d79100d5e973549b48a891
tree6a7ff511ba2de020b91c618624313a55387ff7f9
parent0c00e734ef2b1cac83cf71f331bdb0f6e504de23
parent3a6dfec864d569c2d0a875e1a7466f51b00edb63
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>