[FFmpeg-cvslog] avformat/matroska: Move ff_matroska_video_stereo_plane to demuxer
Andreas Rheinhardt
git at videolan.org
Wed Aug 30 21:09:09 EEST 2023
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Aug 11 01:53:54 2023 +0200| [3fc9ed8497b93909c11e7189f7307a07897411d0] | committer: Andreas Rheinhardt
avformat/matroska: Move ff_matroska_video_stereo_plane to demuxer
Only used there.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3fc9ed8497b93909c11e7189f7307a07897411d0
---
libavformat/matroska.c | 6 ------
libavformat/matroska.h | 1 -
libavformat/matroskadec.c | 8 +++++++-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 79b2d09984..acfacc85dd 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -146,12 +146,6 @@ const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_
"block_rl",
};
-const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT] = {
- "left",
- "right",
- "background",
-};
-
int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode)
{
AVStereo3D *stereo;
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index ead7c085b9..c5b5a4b310 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -387,7 +387,6 @@ extern const CodecTags ff_mkv_codec_tags[];
extern const CodecTags ff_webm_codec_tags[];
extern const AVMetadataConv ff_mkv_metadata_conv[];
extern const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_NB];
-extern const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT];
/* AVStream Metadata tag keys for WebM Dash Manifest */
#define INITIALIZATION_RANGE "webm_dash_manifest_initialization_range"
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 49950956b6..c6042eed2b 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -824,6 +824,12 @@ static const CodecMime mkv_mime_tags[] = {
{"" , AV_CODEC_ID_NONE}
};
+static const char * const matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT] = {
+ "left",
+ "right",
+ "background",
+};
+
static const char *const matroska_doctypes[] = { "matroska", "webm" };
/*
@@ -2991,7 +2997,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT)
continue;
snprintf(buf, sizeof(buf), "%s_%d",
- ff_matroska_video_stereo_plane[planes[j].type], i);
+ matroska_video_stereo_plane[planes[j].type], i);
for (k=0; k < matroska->tracks.nb_elem; k++)
if (planes[j].uid == tracks[k].uid && tracks[k].stream) {
av_dict_set(&tracks[k].stream->metadata,
More information about the ffmpeg-cvslog
mailing list