[FFmpeg-cvslog] wtv: make ff_format_videoinfo2 visible to wtv encoder

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Mon Dec 23 20:39:13 2013 +1100| [686b6dc33a36ed19e6bcf07395b347d67290a4bc] | committer: Michael Niedermayer

wtv: make ff_format_videoinfo2 visible to wtv encoder

Signed-off-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/wtv.h        |    2 ++
 libavformat/wtv_common.c |    2 ++
 libavformat/wtvdec.c     |    6 +-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavformat/wtv.h b/libavformat/wtv.h
index efe90d6..f26ad5e 100644
--- a/libavformat/wtv.h
+++ b/libavformat/wtv.h
@@ -55,4 +55,6 @@ extern const ff_asf_guid ff_mediasubtype_cpfilters_processed;
 extern const ff_asf_guid ff_format_cpfilters_processed;
 extern const ff_asf_guid ff_format_waveformatex;
 extern const ff_asf_guid ff_format_mpeg2_video;
+extern const ff_asf_guid ff_format_videoinfo2;
+
 #endif /* AVFORMAT_WTV_H */
diff --git a/libavformat/wtv_common.c b/libavformat/wtv_common.c
index 5b1e61b..ce4349d 100644
--- a/libavformat/wtv_common.c
+++ b/libavformat/wtv_common.c
@@ -75,6 +75,8 @@ const ff_asf_guid ff_format_waveformatex =
     {0x81,0x9F,0x58,0x05,0x56,0xC3,0xCE,0x11,0xBF,0x01,0x00,0xAA,0x00,0x55,0x59,0x5A};
 const ff_asf_guid ff_format_mpeg2_video =
     {0xE3,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA};
+const ff_asf_guid ff_format_videoinfo2 =
+    {0xA0,0x76,0x2A,0xF7,0x0A,0xEB,0xD0,0x11,0xAC,0xE4,0x00,0x00,0xC0,0xCC,0x16,0xBA};
 
 const AVCodecGuid ff_video_guids[] = {
     {AV_CODEC_ID_MPEG2VIDEO, {0x26,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}},
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index ce76754..21236fa 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -372,10 +372,6 @@ static const ff_asf_guid mediasubtype_dtvccdata =
 static const ff_asf_guid mediasubtype_mpeg2_sections =
     {0x79,0x85,0x9F,0x4A,0xF8,0x6B,0x92,0x43,0x8A,0x6D,0xD2,0xDD,0x09,0xFA,0x78,0x61};
 
-/* Formats */
-static const ff_asf_guid format_videoinfo2 =
-    {0xA0,0x76,0x2A,0xF7,0x0A,0xEB,0xD0,0x11,0xAC,0xE4,0x00,0x00,0xC0,0xCC,0x16,0xBA};
-
 static int read_probe(AVProbeData *p)
 {
     return ff_guidcmp(p->buf, ff_wtv_guid) ? 0 : AVPROBE_SCORE_MAX;
@@ -691,7 +687,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid,
         st = new_stream(s, st, sid, AVMEDIA_TYPE_VIDEO);
         if (!st)
             return NULL;
-        if (!ff_guidcmp(formattype, format_videoinfo2)) {
+        if (!ff_guidcmp(formattype, ff_format_videoinfo2)) {
             int consumed = parse_videoinfoheader2(s, st);
             avio_skip(pb, FFMAX(size - consumed, 0));
         } else if (!ff_guidcmp(formattype, ff_format_mpeg2_video)) {