generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg: drop redundant frame_pts value

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-16 16:32:50 +01:00
parent 2d0440f93f
commit 261e8ccbd1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ffmpeg.c
View File

@ -1214,7 +1214,6 @@ static int reap_filters(void)
{ {
AVFrame *filtered_frame = NULL; AVFrame *filtered_frame = NULL;
int i; int i;
int64_t frame_pts;
/* Reap all buffers present in the buffer sinks */ /* Reap all buffers present in the buffer sinks */
for (i = 0; i < nb_output_streams; i++) { for (i = 0; i < nb_output_streams; i++) {
@ -1247,10 +1246,10 @@ static int reap_filters(void)
av_frame_unref(filtered_frame); av_frame_unref(filtered_frame);
continue; continue;
} }
frame_pts = AV_NOPTS_VALUE;
if (filtered_frame->pts != AV_NOPTS_VALUE) { if (filtered_frame->pts != AV_NOPTS_VALUE) {
int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
filtered_frame->pts = frame_pts = filtered_frame->pts =
av_rescale_q(filtered_frame->pts, filter->inputs[0]->time_base, enc->time_base) - av_rescale_q(filtered_frame->pts, filter->inputs[0]->time_base, enc->time_base) -
av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base); av_rescale_q(start_time, AV_TIME_BASE_Q, enc->time_base);
} }
@ -1259,7 +1258,6 @@ static int reap_filters(void)
switch (filter->inputs[0]->type) { switch (filter->inputs[0]->type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
filtered_frame->pts = frame_pts;
if (!ost->frame_aspect_ratio.num) if (!ost->frame_aspect_ratio.num)
enc->sample_aspect_ratio = filtered_frame->sample_aspect_ratio; enc->sample_aspect_ratio = filtered_frame->sample_aspect_ratio;
@ -1272,7 +1270,6 @@ static int reap_filters(void)
do_video_out(of->ctx, ost, filtered_frame); do_video_out(of->ctx, ost, filtered_frame);
break; break;
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
filtered_frame->pts = frame_pts;
if (!(enc->codec->capabilities & CODEC_CAP_PARAM_CHANGE) && if (!(enc->codec->capabilities & CODEC_CAP_PARAM_CHANGE) &&
enc->channels != av_frame_get_channels(filtered_frame)) { enc->channels != av_frame_get_channels(filtered_frame)) {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,