mpegts: use avcodec_get_type() to set codec_type

[ffmpeg] / libavformat / oggparsedirac.c

diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c
index f6afafd0e4b623d60e23c32b6817549cfe73ed31..55a0b59127ed5a0297bbd607fd50fe20b9341550 100644 (file)
--- a/libavformat/oggparsedirac.c
+++ b/libavformat/oggparsedirac.c
@@ -21,6 +21,7 @@
 #include "libavcodec/get_bits.h"
 #include "libavcodec/dirac.h"
 #include "avformat.h"
+#include "internal.h"
 #include "oggdec.h"
 
 static int dirac_header(AVFormatContext *s, int idx)
@@ -32,17 +33,17 @@ static int dirac_header(AVFormatContext *s, int idx)
     GetBitContext gb;
 
     // already parsed the header
-    if (st->codec->codec_id == CODEC_ID_DIRAC)
+    if (st->codec->codec_id == AV_CODEC_ID_DIRAC)
         return 0;
 
     init_get_bits(&gb, os->buf + os->pstart + 13, (os->psize - 13) * 8);
-    if (ff_dirac_parse_sequence_header(st->codec, &gb, &source) < 0)
+    if (avpriv_dirac_parse_sequence_header(st->codec, &gb, &source) < 0)
         return -1;
 
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id = CODEC_ID_DIRAC;
+    st->codec->codec_id = AV_CODEC_ID_DIRAC;
     // dirac in ogg always stores timestamps as though the video were interlaced
-    av_set_pts_info(st, 64, st->codec->time_base.num, 2*st->codec->time_base.den);
+    avpriv_set_pts_info(st, 64, st->codec->time_base.num, 2*st->codec->time_base.den);
     return 1;
 }
 
@@ -78,8 +79,8 @@ static int old_dirac_header(AVFormatContext *s, int idx)
         return 0;
 
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id = CODEC_ID_DIRAC;
-    av_set_pts_info(st, 64, AV_RB32(buf+12), AV_RB32(buf+8));
+    st->codec->codec_id = AV_CODEC_ID_DIRAC;
+    avpriv_set_pts_info(st, 64, AV_RB32(buf+12), AV_RB32(buf+8));
     return 1;
 }
 
@@ -103,6 +104,7 @@ const struct ogg_codec ff_dirac_codec = {
     .header = dirac_header,
     .gptopts = dirac_gptopts,
     .granule_is_start = 1,
+    .nb_header = 1,
 };
 
 const struct ogg_codec ff_old_dirac_codec = {
@@ -111,4 +113,5 @@ const struct ogg_codec ff_old_dirac_codec = {
     .header = old_dirac_header,
     .gptopts = old_dirac_gptopts,
     .granule_is_start = 1,
+    .nb_header = 1,
 };