Remove flexible array member from Escape 124

[ffmpeg] / libavformat / nut.c

diff --git a/libavformat/nut.c b/libavformat/nut.c
index 546bde1cd0032758c53258f8bd359d46263b5cc1..e790691fc8c0f8d60235205d6c243c1bf9b10dbf 100644 (file)
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -22,11 +22,19 @@
 #include "nut.h"
 #include "tree.h"
 
+const AVCodecTag ff_nut_subtitle_tags[] = {
+    { CODEC_ID_TEXT        , MKTAG('U', 'T', 'F', '8') },
+    { CODEC_ID_SSA         , MKTAG('S', 'S', 'A',  0 ) },
+    { CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') },
+    { CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') },
+    { CODEC_ID_NONE        , 0                         }
+};
+
 void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
     int i;
     for(i=0; i<nut->avf->nb_streams; i++){
         nut->stream[i].last_pts= av_rescale_rnd(
-            val / nut->time_base_count,
+            val,
             time_base.num * (int64_t)nut->stream[i].time_base->den,
             time_base.den * (int64_t)nut->stream[i].time_base->num,
             AV_ROUND_DOWN);
@@ -60,3 +68,14 @@ void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts){
         av_free(node);
     }
 }
+
+const Dispositions ff_nut_dispositions[] = {
+    {"default"     , AV_DISPOSITION_DEFAULT},
+    {"dub"         , AV_DISPOSITION_DUB},
+    {"original"    , AV_DISPOSITION_ORIGINAL},
+    {"comment"     , AV_DISPOSITION_COMMENT},
+    {"lyrics"      , AV_DISPOSITION_LYRICS},
+    {"karaoke"     , AV_DISPOSITION_KARAOKE},
+    {""            , 0}
+};
+