Commit 9dcd7966 authored by Gildas Bazin's avatar Gildas Bazin

* src/input/es_out.c: fixed ES_OUT_SET_FMT control.

parent c1017cc7
...@@ -997,7 +997,7 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args ) ...@@ -997,7 +997,7 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
* to update the p_extra data */ * to update the p_extra data */
es_format_t *p_fmt = (es_format_t*) va_arg( args, es_format_t * ); es_format_t *p_fmt = (es_format_t*) va_arg( args, es_format_t * );
es = (es_out_id_t*) va_arg( args, es_out_id_t * ); es = (es_out_id_t*) va_arg( args, es_out_id_t * );
if( es == NULL || !es->p_dec ) return VLC_EGENERIC; if( es == NULL ) return VLC_EGENERIC;
if( p_fmt->i_extra ) if( p_fmt->i_extra )
{ {
...@@ -1005,6 +1005,8 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args ) ...@@ -1005,6 +1005,8 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
es->fmt.p_extra = realloc( es->fmt.p_extra, p_fmt->i_extra ); es->fmt.p_extra = realloc( es->fmt.p_extra, p_fmt->i_extra );
memcpy( es->fmt.p_extra, p_fmt->p_extra, p_fmt->i_extra ); memcpy( es->fmt.p_extra, p_fmt->p_extra, p_fmt->i_extra );
if( !es->p_dec ) return VLC_SUCCESS;
es->p_dec->fmt_in.i_extra = p_fmt->i_extra; es->p_dec->fmt_in.i_extra = p_fmt->i_extra;
es->p_dec->fmt_in.p_extra = es->p_dec->fmt_in.p_extra =
realloc( es->p_dec->fmt_in.p_extra, p_fmt->i_extra ); realloc( es->p_dec->fmt_in.p_extra, p_fmt->i_extra );
......
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