diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:45:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:45:23 +0200 |
| commit | 8be93ba049f1bb62ce03a86f7d9a8a49934b9ff8 (patch) | |
| tree | 5ad5d978fc657472427069c40ac0a7f24574f886 | |
| parent | 3ae818f6ab04f14838ee073e685d73519725f6d1 (diff) | |
| parent | 28c020d4df9b060a58a124a7a5406d4313fbe249 (diff) | |
| download | ffmpeg-8be93ba049f1bb62ce03a86f7d9a8a49934b9ff8.tar.gz | |
Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'
* commit '28c020d4df9b060a58a124a7a5406d4313fbe249':
matroskaenc: check avio_open_dyn_buf return value
Conflicts:
libavformat/matroskaenc.c
See: b1f517f503139ab9d0c406228b53663e86a128df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskaenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a0b5950784..a3f4e052ce 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1693,7 +1693,8 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_ if (!s->pb->seekable) { if (!mkv->dyn_bc) { - if ((ret = avio_open_dyn_buf(&mkv->dyn_bc)) < 0) { + ret = avio_open_dyn_buf(&mkv->dyn_bc); + if (ret < 0) { av_log(s, AV_LOG_ERROR, "Failed to open dynamic buffer\n"); return ret; } |