Skip to content

V
vlc-2-2
Commit 20990b34 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* ffmpeg/video.c: in case of mpeg4 stream search in p_bitmapinfo for 

an vol header. (In fact reverse an prevous commit)
parent 6a0bfbd6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/codec/ffmpeg/video.c
View file @ 20990b34
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video.c: video decoder using ffmpeg library * video.c: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.15 2003/01/07 21:49:01 fenrir Exp $ * $Id: video.c,v 1.16 2003/01/08 10:41:57 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -360,7 +360,7 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec ) ...@@ -360,7 +360,7 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
switch( p_vdec->i_codec_id ) switch( p_vdec->i_codec_id )
{ {
case( CODEC_ID_MPEG4 ): case( CODEC_ID_MPEG4 ):
#if 0 #if 1
avcodec_decode_video( p_vdec->p_context, p_vdec->p_ff_pic, avcodec_decode_video( p_vdec->p_context, p_vdec->p_ff_pic,
&b_gotpicture, &b_gotpicture,
(void *)&p_vdec->p_format[1], (void *)&p_vdec->p_format[1],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment