Commit 17948de9 authored by Aurélien Nephtali's avatar Aurélien Nephtali Committed by 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: default avatarRémi Denis-Courmont <rdenis@simphalempin.com>
parent df89b213
...@@ -2185,12 +2185,12 @@ static picture_t *video_new_buffer( vlc_object_t *p_this, picture_t **pp_ring, ...@@ -2185,12 +2185,12 @@ static picture_t *video_new_buffer( vlc_object_t *p_this, picture_t **pp_ring,
i = 0; 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_pic = picture_New( p_dec->fmt_out.video.i_chroma,
p_dec->fmt_out.video.i_width, p_dec->fmt_out.video.i_width,
p_dec->fmt_out.video.i_height, p_dec->fmt_out.video.i_height,
p_dec->fmt_out.video.i_aspect ); p_dec->fmt_out.video.i_aspect );
if( !p_pic ) return NULL; 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) ); p_pic->p_sys = calloc( 1, sizeof(picture_sys_t) );
if( !p_pic->p_sys ) if( !p_pic->p_sys )
{ {
......
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