[FFmpeg-devel] SVN 22599: Missing dependency for ff_h264_hl_decode_mb

[Måns Rullgård]

Aurelien Jacobs <aurel at gnuage.org> writes:

> On Fri, Mar 19, 2010 at 03:47:46PM -0700, Thierry Foucu wrote:
>> They are all related to the same one:
>> 
>> ffmpeg/svn/libavcodec/error_resilience.c:54: undefined reference to
>> `ff_h264_hl_decode_mb'
>
> Attached patch fix this issue.
>
> Aurel
>
> Index: libavcodec/error_resilience.c
> ===================================================================
> --- libavcodec/error_resilience.c	(revision 22608)
> +++ libavcodec/error_resilience.c	(working copy)
> @@ -43,7 +43,7 @@
>      s->dest[1] = s->current_picture.data[1] + (s->mb_y * (16>>s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16>>s->chroma_x_shift);
>      s->dest[2] = s->current_picture.data[2] + (s->mb_y * (16>>s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16>>s->chroma_x_shift);
>  
> -    if(s->codec_id == CODEC_ID_H264){
> +    if(CONFIG_H264_DECODER && s->codec_id == CODEC_ID_H264){
>          H264Context *h= (void*)s;
>          h->mb_xy= s->mb_x + s->mb_y*s->mb_stride;
>          memset(h->non_zero_count_cache, 0, sizeof(h->non_zero_count_cache));

Looks reasonable to me, but I'm not maintainer.

-- 
M?ns Rullg?rd
mans at mansr.com