[FFmpeg-cvslog] avcodec/raw: add avpriv_get_raw_pix_fmt_tags()

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Aug  7 01:22:48 2014 -0300| [0ab00a75e41f4399126777e49385c809d8fcc311] | committer: Michael Niedermayer

avcodec/raw: add avpriv_get_raw_pix_fmt_tags()

Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ab00a75e41f4399126777e49385c809d8fcc311
---

 libavcodec/raw.c    |    5 +++++
 libavcodec/raw.h    |    6 ++++++
 libavdevice/dshow.c |    2 +-
 libavformat/utils.c |    2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 56c4a6b..62ad338 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -224,6 +224,11 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
     { AV_PIX_FMT_NONE, 0 },
 };
 
+const struct PixelFormatTag *avpriv_get_raw_pix_fmt_tags(void)
+{
+    return ff_raw_pix_fmt_tags;
+}
+
 unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat fmt)
 {
     const PixelFormatTag *tags = ff_raw_pix_fmt_tags;
diff --git a/libavcodec/raw.h b/libavcodec/raw.h
index 1812825..a79b851 100644
--- a/libavcodec/raw.h
+++ b/libavcodec/raw.h
@@ -35,7 +35,13 @@ typedef struct PixelFormatTag {
     unsigned int fourcc;
 } PixelFormatTag;
 
+#if LIBAVCODEC_VERSION_MAJOR < 56
 extern av_export const PixelFormatTag ff_raw_pix_fmt_tags[];
+#else
+extern const PixelFormatTag ff_raw_pix_fmt_tags[]; // exposed through avpriv_get_raw_pix_fmt_tags()
+#endif
+
+const struct PixelFormatTag *avpriv_get_raw_pix_fmt_tags(void);
 
 enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags, unsigned int fourcc);
 
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index adf36a7..2c098d4 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -92,7 +92,7 @@ static enum AVPixelFormat dshow_pixfmt(DWORD biCompression, WORD biBitCount)
                 return AV_PIX_FMT_0RGB32;
         }
     }
-    return avpriv_find_pix_fmt(ff_raw_pix_fmt_tags, biCompression); // all others
+    return avpriv_find_pix_fmt(avpriv_get_raw_pix_fmt_tags(), biCompression); // all others
 }
 
 static int
diff --git a/libavformat/utils.c b/libavformat/utils.c
index d4f369b..cc52d0e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3275,7 +3275,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
         if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
             if (st->codec->codec_id == AV_CODEC_ID_RAWVIDEO && !st->codec->codec_tag && !st->codec->bits_per_coded_sample) {
                 uint32_t tag= avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt);
-                if (avpriv_find_pix_fmt(ff_raw_pix_fmt_tags, tag) == st->codec->pix_fmt)
+                if (avpriv_find_pix_fmt(avpriv_get_raw_pix_fmt_tags(), tag) == st->codec->pix_fmt)
                     st->codec->codec_tag= tag;
             }