[vlc-devel] commit: Fixed 88d70be07244c54280dda90ac43acfc25cc28ee0 cherry-pick (mlp/ thrd). (Laurent Aimar )

git version control git at videolan.org
Sun Jun 28 02:02:38 CEST 2009


vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Sun Jun 28 02:02:03 2009 +0200| [a54f71697783306c658be75061028f594a180886] | committer: Laurent Aimar 

Fixed 88d70be07244c54280dda90ac43acfc25cc28ee0 cherry-pick (mlp/thrd).

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

 modules/packetizer/mlp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/packetizer/mlp.c b/modules/packetizer/mlp.c
index a02ae77..85a7b6b 100644
--- a/modules/packetizer/mlp.c
+++ b/modules/packetizer/mlp.c
@@ -120,7 +120,7 @@ static int Open( vlc_object_t *p_this )
     decoder_t *p_dec = (decoder_t*)p_this;
     decoder_sys_t *p_sys;
 
-    if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','l','p',' ') ||
+    if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','l','p',' ') &&
         p_dec->fmt_in.i_codec != VLC_FOURCC('t','r','h','d') )
         return VLC_EGENERIC;
 




More information about the vlc-devel mailing list