diff mbox

[FFmpeg-devel,v2,1/7] fftools/ffmpeg: Fix forward CPB props in to out

Message ID 20191219164327.9900-2-nicolas.gaullier@cji.paris
State New
Headers show

Commit Message

Nicolas Gaullier Dec. 19, 2019, 4:43 p.m. UTC 
CPB side_data is copied when stream-copying (see init_output_stream_streamcopy()),
but it shall not be copied when the stream is decoded.
---
 fftools/ffmpeg.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer Dec. 21, 2019, 1:53 p.m. UTC | #1 
On Thu, Dec 19, 2019 at 05:43:21PM +0100, Nicolas Gaullier wrote:
> CPB side_data is copied when stream-copying (see init_output_stream_streamcopy()),
> but it shall not be copied when the stream is decoded.
> ---
>  fftools/ffmpeg.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply

thx

[...]
diff mbox

Patch

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);
+                }
             }
         }