Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 20:10:34 +0000 (22:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 20:10:47 +0000 (22:10 +0200)
commit449c74f629cb35cfd88b5d2b0d7accf0df225bc0
treea828ffa8fe1277240e9f5e806791b17ca91529b5
parent63b0356274bc496c486cbedcb563302c36996024
parent8a78ae2d2101622fd244b99178d8bc61175c878e
Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'

* commit '8a78ae2d2101622fd244b99178d8bc61175c878e':
  segment: Check open_null_ctx() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/segment.c