The branch, master has been updated
via 0599d508c90b49bdead385edcec429e2dd50526e (commit)
via bc4d03c530cf6f6e2a052a0b2de22b0f15a71a34 (commit)
from cb5dbb30caeb9b44897251892350f0e8297b9437 (commit)
- Log -----------------------------------------------------------------
commit 0599d508c90b49bdead385edcec429e2dd50526e
Author: Lynne <[email protected]>
AuthorDate: Thu Aug 28 15:14:03 2025 +0900
Commit: Lynne <[email protected]>
CommitDate: Thu Sep 25 19:14:12 2025 +0900
prores_raw: use MKBETAG for the frame header tag
Equivalent, but more explicit. All values in the header are big endian.
diff --git a/libavcodec/prores_raw.c b/libavcodec/prores_raw.c
index 81d96f16dd..a872677e77 100644
--- a/libavcodec/prores_raw.c
+++ b/libavcodec/prores_raw.c
@@ -355,7 +355,7 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA;
/* ProRes RAW frame */
- if (bytestream2_get_le32(&gb) != MKTAG('p','r','r','f'))
+ if (bytestream2_get_be32(&gb) != MKBETAG('p','r','r','f'))
return AVERROR_INVALIDDATA;
int header_len = bytestream2_get_be16(&gb);
diff --git a/libavcodec/prores_raw_parser.c b/libavcodec/prores_raw_parser.c
index fca3ec37fb..c67935a820 100644
--- a/libavcodec/prores_raw_parser.c
+++ b/libavcodec/prores_raw_parser.c
@@ -46,7 +46,7 @@ static int prores_raw_parse(AVCodecParserContext *s,
AVCodecContext *avctx,
if (bytestream2_get_be32(&gb) != buf_size) /* Packet size */
return buf_size;
- if (bytestream2_get_le32(&gb) != MKTAG('p','r','r','f')) /* Frame header */
+ if (bytestream2_get_be32(&gb) != MKBETAG('p','r','r','f')) /* Frame header
*/
return buf_size;
int header_size = bytestream2_get_be16(&gb);
commit bc4d03c530cf6f6e2a052a0b2de22b0f15a71a34
Author: Lynne <[email protected]>
AuthorDate: Thu Aug 28 15:12:52 2025 +0900
Commit: Lynne <[email protected]>
CommitDate: Thu Sep 25 19:14:08 2025 +0900
prores_raw: set profile based on the codec tag
This is the same as what the parser does.
diff --git a/libavcodec/prores_raw.c b/libavcodec/prores_raw.c
index b2aa97ddda..81d96f16dd 100644
--- a/libavcodec/prores_raw.c
+++ b/libavcodec/prores_raw.c
@@ -334,6 +334,21 @@ static int decode_frame(AVCodecContext *avctx,
DECLARE_ALIGNED(32, uint8_t, qmat)[64];
memset(qmat, 1, 64);
+ switch (avctx->codec_tag) {
+ case 0:
+ break;
+ case MKTAG('a','p','r','n'):
+ avctx->profile = AV_PROFILE_PRORES_RAW;
+ break;
+ case MKTAG('a','p','r','h'):
+ avctx->profile = AV_PROFILE_PRORES_RAW_HQ;
+ break;
+ default:
+ avpriv_request_sample(avctx, "Profile %d", avctx->codec_tag);
+ return AVERROR_PATCHWELCOME;
+ break;
+ }
+
GetByteContext gb;
bytestream2_init(&gb, avpkt->data, avpkt->size);
if (bytestream2_get_be32(&gb) != avpkt->size)
-----------------------------------------------------------------------
Summary of changes:
libavcodec/prores_raw.c | 17 ++++++++++++++++-
libavcodec/prores_raw_parser.c | 2 +-
2 files changed, 17 insertions(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
