jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1120 from pkviet/ffmpeg

Browse Source 
obs-ffmpeg: Fix ffmpeg output recording in x264
This commit is contained in:
Jim 2018-01-05 16:47:07 -08:00 committed by GitHub
commit 05a8969439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/obs-ffmpeg/obs-ffmpeg-output.c
View File

@ -700,8 +700,8 @@ static void receive_video(void *param, struct video_data *frame)
data->vframe->linesize);
else
copy_data(data->vframe, frame, context->height, context->pix_fmt);
if (data->output->flags) {
#if LIBAVFORMAT_VERSION_MAJOR < 58
if (data->output->flags & AVFMT_RAWPICTURE) {
packet.flags |= AV_PKT_FLAG_KEY;
packet.stream_index = data->video->index;
packet.data = data->vframe->data[0];
@ -713,6 +713,7 @@ static void receive_video(void *param, struct video_data *frame)
os_sem_post(output->write_sem);
} else {
#endif
data->vframe->pts = data->total_frames;
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
ret = avcodec_send_frame(context, data->vframe);
@ -749,8 +750,9 @@ static void receive_video(void *param, struct video_data *frame)
} else {
ret = 0;
}
#if LIBAVFORMAT_VERSION_MAJOR < 58
}
#endif
if (ret != 0) {
blog(LOG_WARNING, "receive_video: Error writing video: %s",
av_err2str(ret));