Skip to content
Snippets Groups Projects
Commit ef4e6fa8 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

videomanager: handle null frame

Handles case (and avoids crash) when copying a hw-encoded frame
from Android.

Change-Id: I266afe86018b0d2f6c944314397115cf01c6af04
parent d6e2b8a3
No related branches found
No related tags found
No related merge requests found
...@@ -66,12 +66,18 @@ void ...@@ -66,12 +66,18 @@ void
MediaFrame::copyFrom(const MediaFrame& o) MediaFrame::copyFrom(const MediaFrame& o)
{ {
reset(); reset();
if (o.frame_)
av_frame_ref(frame_.get(), o.frame_.get()); av_frame_ref(frame_.get(), o.frame_.get());
if (o.packet_) {
packet_.reset(av_packet_alloc());
av_packet_ref(packet_.get(), o.packet_.get());
}
} }
void void
MediaFrame::reset() noexcept MediaFrame::reset() noexcept
{ {
if (frame_)
av_frame_unref(frame_.get()); av_frame_unref(frame_.get());
packet_.reset(); packet_.reset();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment