[SCM] libav/experimental: Use VA_INVALID_ID instead of hard coded values.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e6d3534f9c4e713772a980889b6fa5aa6b5143f3
Author: Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
Date:   Mon Dec 28 15:19:36 2009 +0000

    Use VA_INVALID_ID instead of hard coded values.
    
    Originally committed as revision 20948 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index 1281f9a..21bc778 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -54,8 +54,8 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
         return -1;
     pic_param->horizontal_size                                  = s->width;
     pic_param->vertical_size                                    = s->height;
-    pic_param->forward_reference_picture                        = 0xffffffff;
-    pic_param->backward_reference_picture                       = 0xffffffff;
+    pic_param->forward_reference_picture                        = VA_INVALID_ID;
+    pic_param->backward_reference_picture                       = VA_INVALID_ID;
     pic_param->picture_coding_type                              = s->pict_type;
     pic_param->f_code                                           = mpeg2_get_f_code(s);
     pic_param->picture_coding_extension.value                   = 0; /* reset all bits */
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index 15883a8..4e606f0 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -56,8 +56,8 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
         return -1;
     pic_param->vop_width                                = s->width;
     pic_param->vop_height                               = s->height;
-    pic_param->forward_reference_picture                = 0xffffffff;
-    pic_param->backward_reference_picture               = 0xffffffff;
+    pic_param->forward_reference_picture                = VA_INVALID_ID;
+    pic_param->backward_reference_picture               = VA_INVALID_ID;
     pic_param->vol_fields.value                         = 0; /* reset all bits */
     pic_param->vol_fields.bits.short_video_header       = avctx->codec->id == CODEC_ID_H263;
     pic_param->vol_fields.bits.chroma_format            = CHROMA_420;
diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
index b3777f5..efeaff1 100644
--- a/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@ -145,9 +145,9 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
     pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferVC1));
     if (!pic_param)
         return -1;
-    pic_param->forward_reference_picture                            = 0xffffffff;
-    pic_param->backward_reference_picture                           = 0xffffffff;
-    pic_param->inloop_decoded_picture                               = 0xffffffff;
+    pic_param->forward_reference_picture                            = VA_INVALID_ID;
+    pic_param->backward_reference_picture                           = VA_INVALID_ID;
+    pic_param->inloop_decoded_picture                               = VA_INVALID_ID;
     pic_param->sequence_fields.value                                = 0; /* reset all bits */
     pic_param->sequence_fields.bits.pulldown                        = v->broadcast;
     pic_param->sequence_fields.bits.interlace                       = v->interlace;

-- 
Libav/FFmpeg packaging