aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJeff Downs <heydowns@borg.com>2007-10-04 06:41:49 +0000
committerAndreas Ă–man <andreas@lonelycoder.com>2007-10-04 06:41:49 +0000
commitc58b7471530e5a92b857cf82febf345c57c1295a (patch)
treedaefecac9c1524c9ecdd9cc7e64bd576392d6e68 /libavcodec
parent47e112f8729290068ec88cc3b8402c4ca7ac99a5 (diff)
downloadffmpeg-c58b7471530e5a92b857cf82febf345c57c1295a.tar.gz
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
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 95e76d57bc..26950022a8 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){