1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #3534

Diadlo (1):
      fix(corevideosource): Partial revert of ef641ce6d3
This commit is contained in:
sudden6 2016-07-24 16:00:45 +02:00
commit 1c8a7e49c1
No known key found for this signature in database
GPG Key ID: 279509B499E032B9

View File

@ -59,6 +59,7 @@ void CoreVideoSource::pushFrame(const vpx_image_t* vpxframe)
av_frame_free(&avframe); av_frame_free(&avframe);
return; return;
} }
avframe->opaque = buf;
uint8_t** data = avframe->data; uint8_t** data = avframe->data;
int* linesize = avframe->linesize; int* linesize = avframe->linesize;
@ -81,7 +82,6 @@ void CoreVideoSource::pushFrame(const vpx_image_t* vpxframe)
vframe = std::make_shared<VideoFrame>(avframe); vframe = std::make_shared<VideoFrame>(avframe);
av_free(buf);
emit frameAvailable(vframe); emit frameAvailable(vframe);
} }