RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: re-enable use of buffersrc flags. 

AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.
This commit is contained in:
Nicolas George 2013-03-10 14:07:29 +01:00
parent b0012de420
commit fb14e37dd0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffmpeg.c
View File

@ -220,7 +220,9 @@ static void sub2video_push_ref(InputStream *ist, int64_t pts)
av_assert1(frame->data[0]); av_assert1(frame->data[0]);
ist->sub2video.last_pts = frame->pts = pts; ist->sub2video.last_pts = frame->pts = pts;
for (i = 0; i < ist->nb_filters; i++) for (i = 0; i < ist->nb_filters; i++)
av_buffersrc_write_frame(ist->filters[i]->filter, frame); av_buffersrc_add_frame_flags(ist->filters[i]->filter, frame,
AV_BUFFERSRC_FLAG_KEEP_REF |
AV_BUFFERSRC_FLAG_PUSH);
} }
static void sub2video_update(InputStream *ist, AVSubtitle *sub) static void sub2video_update(InputStream *ist, AVSubtitle *sub)
@ -1641,8 +1643,9 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
(AVRational){1, ist->st->codec->sample_rate}, decoded_frame->nb_samples, &ist->filter_in_rescale_delta_last, (AVRational){1, ist->st->codec->sample_rate}, decoded_frame->nb_samples, &ist->filter_in_rescale_delta_last,
(AVRational){1, ist->st->codec->sample_rate}); (AVRational){1, ist->st->codec->sample_rate});
for (i = 0; i < ist->nb_filters; i++) for (i = 0; i < ist->nb_filters; i++)
av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame); av_buffersrc_add_frame_flags(ist->filters[i]->filter, decoded_frame,
/* TODO re-add AV_BUFFERSRC_FLAG_PUSH */ AV_BUFFERSRC_FLAG_KEEP_REF |
AV_BUFFERSRC_FLAG_PUSH);
decoded_frame->pts = AV_NOPTS_VALUE; decoded_frame->pts = AV_NOPTS_VALUE;
@ -1751,8 +1754,9 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
AV_BUFFERSRC_FLAG_NO_COPY | AV_BUFFERSRC_FLAG_NO_COPY |
AV_BUFFERSRC_FLAG_PUSH); AV_BUFFERSRC_FLAG_PUSH);
} else } else
if(av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame)<0) { if(av_buffersrc_add_frame_flags(ist->filters[i]->filter, decoded_frame,
/* TODO add back AV_BUFFERSRC_FLAG_PUSH */ AV_BUFFERSRC_FLAG_KEEP_REF |
AV_BUFFERSRC_FLAG_PUSH)<0) {
av_log(NULL, AV_LOG_FATAL, "Failed to inject frame into filter network\n"); av_log(NULL, AV_LOG_FATAL, "Failed to inject frame into filter network\n");
exit(1); exit(1);
} }