[vlc-commits] AVI: do not warn about embedded subtitles

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu May 24 13:42:37 2012 +0200| [e8f45e69c41d02fe581cbadd96a2b31e936eccec] | committer: Jean-Baptiste Kempf

AVI: do not warn about embedded subtitles

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e8f45e69c41d02fe581cbadd96a2b31e936eccec
---

 modules/demux/avi/avi.c    |    4 ++--
 modules/demux/avi/libavi.c |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 92cdcde..63b5f9b 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -2718,9 +2718,9 @@ exit:
         block_Release( p_block );
 
     if( p_attachment )
-        msg_Dbg( p_demux, "Loaded an embed subtitle" );
+        msg_Dbg( p_demux, "Loaded an embedded subtitle" );
     else
-        msg_Warn( p_demux, "Failed to load an embed subtitle" );
+        msg_Warn( p_demux, "Failed to load an embedded subtitle" );
 
     if( p_indx == &ck.indx )
         AVI_ChunkFree( p_demux->s, &ck );
diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index 3f8310a..748b78f 100644
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -416,6 +416,9 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
                      p_chk->strf.vids.p_bih->biBitCount );
 #endif
             break;
+        case( AVIFOURCC_txts ):
+            p_chk->strf.common.i_cat = SPU_ES;
+            break;
         default:
             msg_Warn( (vlc_object_t*)s, "unknown stream type: %4.4s",
                     (char*)&p_strh->strh.i_type );