Merge commit '8a78ae2d2101622fd244b99178d8bc61175c878e'
* commit '8a78ae2d2101622fd244b99178d8bc61175c878e': segment: Check open_null_ctx() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -860,7 +860,8 @@ static int seg_write_trailer(struct AVFormatContext *s)
|
|||||||
if (!seg->write_header_trailer) {
|
if (!seg->write_header_trailer) {
|
||||||
if ((ret = segment_end(s, 0, 1)) < 0)
|
if ((ret = segment_end(s, 0, 1)) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
open_null_ctx(&oc->pb);
|
if ((ret = open_null_ctx(&oc->pb)) < 0)
|
||||||
|
goto fail;
|
||||||
ret = av_write_trailer(oc);
|
ret = av_write_trailer(oc);
|
||||||
close_null_ctxp(&oc->pb);
|
close_null_ctxp(&oc->pb);
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user