]> git.sesse.net Git - vlc/commitdiff
Fixed es_format_t::i_codec/i_original_fourcc values after the decoder.
authorLaurent Aimar <fenrir@videolan.org>
Tue, 12 May 2009 20:52:18 +0000 (22:52 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Wed, 13 May 2009 19:18:19 +0000 (21:18 +0200)
es_format_t::i_codec will be the codec from vlc_fourcc.h
es_format_t::i_original_fourcc will contains the original fourcc
value.

This allows to simplify the decoder/packetizer and every sout modules.

src/input/es_out.c

index c20972a578942290530177019853d6fd827176c1..060461fa92f13b8bce009a362ac0f65c85b945b1 100644 (file)
@@ -1387,6 +1387,10 @@ static es_out_id_t *EsOutAdd( es_out_t *out, const es_format_t *fmt )
     es_format_Copy( &es->fmt, fmt );
     if( es->fmt.i_id < 0 )
         es->fmt.i_id = out->p_sys->i_id;
+    if( !es->fmt.i_original_fourcc )
+        es->fmt.i_original_fourcc = es->fmt.i_codec;
+    es->fmt.i_codec = es_fourcc_GetCodec( es->fmt.i_cat, es->fmt.i_codec );
+
     es->i_id = es->fmt.i_id;
     es->i_meta_id = out->p_sys->i_id;
     es->b_scrambled = false;