Display a more descriptive log message when probe buffer limit is

[ffmpeg] / libavformat / oggparseogm.c

diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 0738d65b52dc0a6e8f3ed52b97003c4bac9de933..e1d046f28ff4cea9c2d0904bfbba8f9a16827e23 100644 (file)
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -49,19 +49,19 @@ ogm_header(AVFormatContext *s, int idx)
 
         if(*p == 'v'){
             int tag;
-            st->codec->codec_type = CODEC_TYPE_VIDEO;
+            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
             p += 8;
             tag = bytestream_get_le32(&p);
             st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
             st->codec->codec_tag = tag;
         } else if (*p == 't') {
-            st->codec->codec_type = CODEC_TYPE_SUBTITLE;
+            st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
             st->codec->codec_id = CODEC_ID_TEXT;
             p += 12;
         } else {
             uint8_t acid[5];
             int cid;
-            st->codec->codec_type = CODEC_TYPE_AUDIO;
+            st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
             p += 8;
             bytestream_get_buffer(&p, acid, 4);
             acid[4] = 0;
@@ -78,7 +78,7 @@ ogm_header(AVFormatContext *s, int idx)
 
         p += 8;                     /* buffersize + bits_per_sample */
 
-        if(st->codec->codec_type == CODEC_TYPE_VIDEO){
+        if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
             st->codec->width = bytestream_get_le32(&p);
             st->codec->height = bytestream_get_le32(&p);
             st->codec->time_base.den = spu * 10000000;
@@ -117,14 +117,14 @@ ogm_dshow_header(AVFormatContext *s, int idx)
     t = AV_RL32(p + 96);
 
     if(t == 0x05589f80){
-        st->codec->codec_type = CODEC_TYPE_VIDEO;
+        st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
         st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68));
         st->codec->time_base.den = 10000000;
         st->codec->time_base.num = AV_RL64(p + 164);
         st->codec->width = AV_RL32(p + 176);
         st->codec->height = AV_RL32(p + 180);
     } else if(t == 0x05589f81){
-        st->codec->codec_type = CODEC_TYPE_AUDIO;
+        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124));
         st->codec->channels = AV_RL16(p + 126);
         st->codec->sample_rate = AV_RL32(p + 128);
@@ -143,12 +143,15 @@ ogm_packet(AVFormatContext *s, int idx)
     int lb;
 
     if(*p & 8)
-        os->pflags |= PKT_FLAG_KEY;
+        os->pflags |= AV_PKT_FLAG_KEY;
 
     lb = ((*p & 2) << 1) | ((*p >> 6) & 3);
     os->pstart += lb + 1;
     os->psize -= lb + 1;
 
+    while (lb--)
+        os->pduration += p[lb+1] << (lb*8);
+
     return 0;
 }