diff options
| author | Nicolas Gaullier <nicolas.gaullier@cji.paris> | 2019-12-19 17:43:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-21 14:46:12 +0100 |
| commit | f40fb7963e64c01f2e726949b06d37ad94e6ad5f (patch) | |
| tree | e8f52db3af26b868a4621df32e97204d156aa9cd /fftools/ffmpeg.c | |
| parent | 26f4ee37f7ce0c04668a3ff38eff31f65e0618be (diff) | |
| download | ffmpeg-f40fb7963e64c01f2e726949b06d37ad94e6ad5f.tar.gz | |
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: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'fftools/ffmpeg.c')
| -rw-r--r-- | fftools/ffmpeg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 27f68933f8..36c207653b 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3562,12 +3562,14 @@ 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); memcpy(dst, sd->data, sd->size); if (ist->autorotate && sd->type == AV_PKT_DATA_DISPLAYMATRIX) av_display_rotation_set((uint32_t *)dst, 0); + } } } |