git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a9179b5
)
oggenc: remove unneeded null check
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 24 Oct 2014 12:15:37 +0000
(13:15 +0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Wed, 29 Oct 2014 16:54:37 +0000
(16:54 +0000)
The code would have segfaulted before if oggstream were NULL.
CC: libav-stable@libav.org
Bug-Id: CID 732218
libavformat/oggenc.c
patch
|
blob
|
history
diff --git
a/libavformat/oggenc.c
b/libavformat/oggenc.c
index
1277a8b
..
8f08da1
100644
(file)
--- a/
libavformat/oggenc.c
+++ b/
libavformat/oggenc.c
@@
-530,7
+530,7
@@
static int ogg_write_header(AVFormatContext *s)
AVStream *st = s->streams[j];
OGGStreamContext *oggstream = st->priv_data;
for (i = 1; i < 3; i++) {
- if (oggstream
&& oggstream
->header_len[i])
+ if (oggstream->header_len[i])
ogg_buffer_data(s, st, oggstream->header[i],
oggstream->header_len[i], 0, 1);
}