changeset 3101:83537aac00f1 libavformat

subtitles (codec tag tables still missing ...)
author michael
date Sun, 02 Mar 2008 23:11:36 +0000
parents 5f769b20cc76
children fca018d1bbce
files nutdec.c nutenc.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/nutdec.c	Sun Mar 02 19:51:31 2008 +0000
+++ b/nutdec.c	Sun Mar 02 23:11:36 2008 +0000
@@ -325,8 +325,11 @@
                 av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
             break;
         case 2:
-//            st->codec->codec_type = CODEC_TYPE_TEXT;
-//            break;
+            st->codec->codec_type = CODEC_TYPE_SUBTITLE;
+//            st->codec->codec_id = codec_get_id(codec_wav_tags, tmp); FIXME
+            if (st->codec->codec_id == CODEC_ID_NONE)
+                av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
+            break;
         case 3:
             st->codec->codec_type = CODEC_TYPE_DATA;
             break;
--- a/nutenc.c	Sun Mar 02 19:51:31 2008 +0000
+++ b/nutenc.c	Sun Mar 02 23:11:36 2008 +0000
@@ -394,7 +394,7 @@
     switch(codec->codec_type){
     case CODEC_TYPE_VIDEO: put_v(bc, 0); break;
     case CODEC_TYPE_AUDIO: put_v(bc, 1); break;
-//    case CODEC_TYPE_TEXT : put_v(bc, 2); break;
+    case CODEC_TYPE_SUBTITLE: put_v(bc, 2); break;
     default              : put_v(bc, 3); break;
     }
     put_v(bc, 4);