Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 06/11] fftools/ffplay: stop using AVStream.side_data
Date: Wed, 27 Sep 2023 10:12:37 -0300
Message-ID: <20230927131242.1950-7-jamrial@gmail.com> (raw)
In-Reply-To: <20230927131242.1950-1-jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>
---
 fftools/ffplay.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 006da7ab57..e29b0ad0f9 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -1916,8 +1916,13 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
         AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX);
         if (sd)
             displaymatrix = (int32_t *)sd->data;
-        if (!displaymatrix)
-            displaymatrix = (int32_t *)av_stream_get_side_data(is->video_st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
+        if (!displaymatrix) {
+            const AVPacketSideData *sd = av_packet_side_data_get(is->video_st->codecpar->side_data,
+                                                                 is->video_st->codecpar->nb_side_data,
+                                                               AV_PKT_DATA_DISPLAYMATRIX);
+            if (sd)
+                displaymatrix = (int32_t *)sd->data;
+        }
         theta = get_rotation(displaymatrix);
 
         if (fabs(theta - 90) < 1.0) {
-- 
2.42.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2023-09-27 13:14 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-27 13:12 [FFmpeg-devel] [PATCH 00/11 v5] AVCodecContext and AVCodecParameters side data James Almer
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 01/11] avcodec/packet: add generic side data helpers James Almer
2023-10-03 12:54   ` Anton Khirnov
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 02/11] avcodec/codec_par: add side data to AVCodecParameters James Almer
2023-10-03 11:23   ` Anton Khirnov
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 03/11] avformat/avformat: use the side data from AVStream.codecpar James Almer
2023-10-03 11:38   ` Anton Khirnov
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 04/11] avcodec/packet: add some documentation for AVPacketSideData James Almer
2023-10-03 11:02   ` Anton Khirnov
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 05/11] fftools/ffmpeg: stop using AVStream.side_data James Almer
2023-10-03 11:50   ` Anton Khirnov
2023-09-27 13:12 ` James Almer [this message]
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 07/11] fftools/ffprobe: " James Almer
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 08/11] avcodec/hevcdec: check for DOVI configuration record in AVCodecContext side data James Almer
2023-10-03 10:18   ` Anton Khirnov
2023-10-03 19:11     ` James Almer
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 09/11] avcodec/decode: check for global side data " James Almer
2023-10-03 12:34   ` Anton Khirnov
2023-10-03 18:46     ` James Almer
2023-10-04  3:22       ` James Almer
2023-10-04 14:36         ` Anton Khirnov
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 10/11] fftools/ffmpeg: stop injecting stream side data in packets James Almer
2023-10-03 11:04   ` Anton Khirnov
2023-09-27 13:12 ` [FFmpeg-devel] [PATCH 11/11] fftools/ffplay: " James Almer
2023-10-03 10:11   ` Anton Khirnov
2023-10-03 11:28     ` Anton Khirnov
2023-10-04 12:28 [FFmpeg-devel] [PATCH 00/11 v6] AVCodecContext and AVCodecParameters side data James Almer
2023-10-04 12:28 ` [FFmpeg-devel] [PATCH 06/11] fftools/ffplay: stop using AVStream.side_data James Almer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230927131242.1950-7-jamrial@gmail.com \
    --to=jamrial@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git