[vlc-devel] commit: Fix crash when transcoding from mpeg2 ( Aurélien Nephtali )

[git version control]

vlc | branch: master | Aurélien Nephtali <aurelien at sitadelle.com> | Tue Feb 17 15:47:07 2009 +0100| [17948de947bf2f2b17e5d2bff3183d4ca1fbad91] | committer: Rémi Denis-Courmont 

Fix crash when transcoding from mpeg2

The attached patch fixes transcoding from mpeg2 with last VLC from git.

jupiter@~/vlc> ./vlc file.ts --sout
'#transcode{vcodec=mp4v}:std{access=file,mux=ts,dst=/dev/null}' -I
dummy
[...]
[0x212d9c0] libmpeg2 decoder debug: 720x576 (display 720,576), aspect
768000, sar 64:45, 25.000 fps
[0x212d9c0] main decoder warning: can't get output picture
[0x212d9c0] libmpeg2 decoder warning: invalid picture encountered
[0x212d9c0] main decoder warning: can't get output picture
zsh: segmentation fault  ./vlc file.ts --sout  -I dummy

Signed-off-by: Rémi Denis-Courmont <rdenis at simphalempin.com>

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

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

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 473467c..67433d1 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2185,12 +2185,12 @@ static picture_t *video_new_buffer( vlc_object_t *p_this, picture_t **pp_ring,
         i = 0;
     }
 
+    p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
     p_pic = picture_New( p_dec->fmt_out.video.i_chroma,
                          p_dec->fmt_out.video.i_width,
                          p_dec->fmt_out.video.i_height,
                          p_dec->fmt_out.video.i_aspect );
     if( !p_pic ) return NULL;
-    p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
     p_pic->p_sys = calloc( 1, sizeof(picture_sys_t) );
     if( !p_pic->p_sys )
     {