Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
58f887c8
Commit
58f887c8
authored
Sep 13, 2013
by
Tristan Matthews
Browse files
* #29564: video: don't crash if find_stream_info failed
parent
1bce9bf8
Changes
2
Hide whitespace changes
Inline
Side-by-side
daemon/src/video/video_decoder.cpp
View file @
58f887c8
...
...
@@ -102,6 +102,11 @@ int VideoDecoder::setupFromVideoData()
avcodec_close
(
decoderCtx_
);
DEBUG
(
"Finding stream info"
);
if
(
!
inputCtx_
->
streams
[
0
]
->
info
)
{
ERROR
(
"Stream info is NULL"
);
return
-
1
;
}
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 8, 0)
ret
=
av_find_stream_info
(
inputCtx_
);
#else
...
...
daemon/src/video/video_receive_thread.cpp
View file @
58f887c8
...
...
@@ -208,7 +208,7 @@ bool VideoReceiveThread::decodeFrame()
// decoding error?
if
(
ret
==
-
2
and
requestKeyFrameCallback_
)
{
WARN
(
"VideoDecoder error, restarting it..."
);
videoDecoder_
->
setupFromVideoData
();
EXIT_IF_FAIL
(
!
videoDecoder_
->
setupFromVideoData
()
,
"Setup failed"
)
;
requestKeyFrameCallback_
(
id_
);
}
else
if
(
ret
<
0
)
{
ERROR
(
"VideoDecoder fatal error, stopping it..."
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment