Commit f40fb796 authored by Nicolas Gaullier's avatar Nicolas Gaullier Committed by Michael Niedermayer

fftools/ffmpeg: Fix forward CPB props in to out

CPB side_data is copied when stream-copying (see init_output_stream_streamcopy()),
but it shall not be copied when the stream is decoded.
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 26f4ee37
......@@ -3562,6 +3562,7 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len)
int i;
for (i = 0; i < ist->st->nb_side_data; i++) {
AVPacketSideData *sd = &ist->st->side_data[i];
if (sd->type != AV_PKT_DATA_CPB_PROPERTIES) {
uint8_t *dst = av_stream_new_side_data(ost->st, sd->type, sd->size);
if (!dst)
return AVERROR(ENOMEM);
......@@ -3570,6 +3571,7 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len)
av_display_rotation_set((uint32_t *)dst, 0);
}
}
}
// copy timebase while removing common factors
if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment