[FFmpeg-devel] [PATCH 4/4] Fix missing guards when error resilience is disabled.

Michael Niedermayer michaelni at gmx.at
Tue May 20 21:38:18 CEST 2014


On Tue, May 20, 2014 at 12:03:59PM -0700, Dale Curtis wrote:
> ---
>  libavcodec/h264_slice.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
> index 49af2c1..a950043 100644
> --- a/libavcodec/h264_slice.c
> +++ b/libavcodec/h264_slice.c
> @@ -1936,8 +1936,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
>                               (h->ref_list[j][i].reference & 3);
>      }
>  
> +#if CONFIG_ERROR_RESILIENCE
>      if (h->ref_count[0]) ff_h264_set_erpic(&h->er.last_pic, &h->ref_list[0][0]);
>      if (h->ref_count[1]) ff_h264_set_erpic(&h->er.next_pic, &h->ref_list[1][0]);
> +#endif

fixed differently (that is with one #if less)

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The educated differ from the uneducated as much as the living from the
dead. -- Aristotle 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140520/095992d8/attachment.asc>


More information about the ffmpeg-devel mailing list