aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Downs <heydowns@borg.com>2007-10-06 15:50:55 +0000
committerAndreas Ă–man <andreas@lonelycoder.com>2007-10-06 15:50:55 +0000
commitd3d8c02b78b436a52e1cb0bdc91eecab3342d9f8 (patch)
tree33368d3bda12d29b4d50577b616c4cfa8c124c77
parent12a09bfa3952e6a7b53cd352920dd0d03cbc6f3e (diff)
downloadffmpeg-d3d8c02b78b436a52e1cb0bdc91eecab3342d9f8.tar.gz
Cosmetic renaming variable so that it makes more sense for forthcoming PAFF mmco patches.
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 10676 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a1ac4aca29..997c3eeec2 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3458,7 +3458,7 @@ static void print_long_term(H264Context *h) {
static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
MpegEncContext * const s = &h->s;
int i, j;
- int current_is_long=0;
+ int current_ref_assigned=0;
Picture *pic;
if((s->avctx->debug&FF_DEBUG_MMCO) && mmco_count==0)
@@ -3501,7 +3501,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
h->long_ref[ mmco[i].long_arg ]->long_ref=1;
h->long_ref_count++;
- current_is_long=1;
+ current_ref_assigned=1;
break;
case MMCO_SET_MAX_LONG:
assert(mmco[i].long_arg <= 16);
@@ -3525,7 +3525,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
}
}
- if(!current_is_long){
+ if(!current_ref_assigned){
pic= remove_short(h, s->current_picture_ptr->frame_num);
if(pic){
unreference_pic(h, pic, 0);