[vlc-devel] commit: Fixed ES_OUT_SET_FMT name. (Laurent Aimar )

git version control git at videolan.org
Mon Nov 17 20:16:37 CET 2008


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Fri Nov  7 01:08:49 2008 +0100| [cdf95dd2b9eb2ace08660d2183479348dfa8e4e3] | committer: Laurent Aimar 

Fixed ES_OUT_SET_FMT name.

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

 include/vlc_es_out.h |    2 +-
 modules/demux/ogg.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 5b255ad..676a595 100644
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -83,7 +83,7 @@ enum es_out_query_e
     ES_OUT_GET_TS,             /* arg1=int64_t i_ts(microsecond!) (using default group 0), arg2=int64_t* converted i_ts */
 
     /* Try not to use this one as it is a bit hacky */
-    ES_OUT_SET_FMT,     /* arg1= es_out_id_t* arg2=es_format_t* */
+    ES_OUT_SET_ES_FMT,         /* arg1= es_out_id_t* arg2=es_format_t* */
 
     /* Allow preroll of data (data with dts/pts < i_pts for all ES will be decoded but not displayed */
     ES_OUT_SET_NEXT_DISPLAY_TIME,   /* arg1=int64_t i_pts(microsecond) */
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 4d9c127..464d99a 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -632,7 +632,7 @@ static void Ogg_DecodePacket( demux_t *p_demux,
                     p_stream->fmt.i_extra = 0;
 
                 if( Ogg_LogicalStreamResetEsFormat( p_demux, p_stream ) )
-                    es_out_Control( p_demux->out, ES_OUT_SET_FMT,
+                    es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
                                     p_stream->p_es, &p_stream->fmt );
             }
         }




More information about the vlc-devel mailing list