From a96506f01748d746591e13d9e1fceb862efde922 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Tue, 4 Aug 2020 11:25:25 +0200
Subject: [PATCH] avcodec/cfhdenc: also write FrameNumber tag

---
 libavcodec/cfhd.h    | 1 +
 libavcodec/cfhdenc.c | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h
index ba381f79f2..b889fe5fa2 100644
--- a/libavcodec/cfhd.h
+++ b/libavcodec/cfhd.h
@@ -72,6 +72,7 @@ enum CFHDParam {
     BandTrailer      =  56,
     ChannelNumber    =  62,
     SampleFlags      =  68,
+    FrameNumber      =  69,
     Precision        =  70,
     InputFormat      =  71,
     BandCodingFlags  =  72,
diff --git a/libavcodec/cfhdenc.c b/libavcodec/cfhdenc.c
index 10cf7c03ac..9b21bc2894 100644
--- a/libavcodec/cfhdenc.c
+++ b/libavcodec/cfhdenc.c
@@ -542,7 +542,7 @@ static int cfhd_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         }
     }
 
-    ret = ff_alloc_packet2(avctx, pkt, 60LL + s->planes * (2LL * avctx->width * avctx->height + 1000LL), 0);
+    ret = ff_alloc_packet2(avctx, pkt, 64LL + s->planes * (2LL * avctx->width * avctx->height + 1000LL), 0);
     if (ret < 0)
         return ret;
 
@@ -587,6 +587,9 @@ static int cfhd_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     bytestream2_put_be16(pby, ImageHeight);
     bytestream2_put_be16(pby, avctx->height);
 
+    bytestream2_put_be16(pby, -FrameNumber);
+    bytestream2_put_be16(pby, avctx->frame_number);
+
     bytestream2_put_be16(pby, Precision);
     bytestream2_put_be16(pby, avctx->pix_fmt == AV_PIX_FMT_YUV422P10 ? 10 : 12);