avcodec/dpx: respect side data preference

If the time code side data is overridden by the packet level, we also
make sure not to update `p->metadata` to a mismatched timecode.

1 files changed, 15 insertions, 13 deletions

diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c
index 31e4a3f82c..80616d98a2 100644
--- a/libavcodec/dpx.c
+++ b/libavcodec/dpx.c
@@ -287,19 +287,21 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p,
         tc = av_bswap32(read32(&buf, endian));
 
         if (i != 0xFFFFFFFF) {
-            AVFrameSideData *tcside =
-                av_frame_new_side_data(p, AV_FRAME_DATA_S12M_TIMECODE,
-                                       sizeof(uint32_t) * 4);
-            if (!tcside)
-                return AVERROR(ENOMEM);
-
-            tc_sd = (uint32_t*)tcside->data;
-            tc_sd[0] = 1;
-            tc_sd[1] = tc;
-
-            av_timecode_make_smpte_tc_string2(tcbuf, avctx->framerate,
-                                              tc_sd[1], 0, 0);
-            av_dict_set(&p->metadata, "timecode", tcbuf, 0);
+            AVFrameSideData *tcside;
+            ret = ff_frame_new_side_data(avctx, p, AV_FRAME_DATA_S12M_TIMECODE,
+                                         sizeof(uint32_t) * 4, &tcside);
+            if (ret < 0)
+                return ret;
+
+            if (tcside) {
+                tc_sd = (uint32_t*)tcside->data;
+                tc_sd[0] = 1;
+                tc_sd[1] = tc;
+
+                av_timecode_make_smpte_tc_string2(tcbuf, avctx->framerate,
+                                                  tc_sd[1], 0, 0);
+                av_dict_set(&p->metadata, "timecode", tcbuf, 0);
+            }
         }
     }