[SCM] libav/experimental: Rename variable to make sense in both field and frame contexts (support of PAFF implementation).

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c58b7471530e5a92b857cf82febf345c57c1295a
Author: Jeff Downs <heydowns at borg.com>
Date:   Thu Oct 4 06:41:49 2007 +0000

    Rename variable to make sense in both field and frame contexts (support of PAFF implementation).
    
    patch by Jeff Downs, heydowns a borg d com
    original thread:
    Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
    Date: 18/09/07 20:30
    
    Originally committed as revision 10662 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 95e76d5..2695002 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3380,12 +3380,12 @@ static int decode_ref_pic_marking(H264Context *h, GetBitContext *gb){
                     }*/
                 }
                 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){
-                    unsigned int long_index= get_ue_golomb(gb);
-                    if(/*h->mmco[i].long_arg >= h->long_ref_count || h->long_ref[ h->mmco[i].long_arg ] == NULL*/ long_index >= 16){
+                    unsigned int long_arg= get_ue_golomb(gb);
+                    if(/*h->mmco[i].long_arg >= h->long_ref_count || h->long_ref[ h->mmco[i].long_arg ] == NULL*/ long_arg >= 16){
                         av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode);
                         return -1;
                     }
-                    h->mmco[i].long_arg= long_index;
+                    h->mmco[i].long_arg= long_arg;
                 }
 
                 if(opcode > (unsigned)MMCO_LONG){

-- 
Libav/FFmpeg packaging