Mercurial > libavcodec.hg
comparison h264.c @ 5771:5290a3850c03 libavcodec
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
author | andoma |
---|---|
date | Thu, 04 Oct 2007 06:41:49 +0000 |
parents | a1a947d67948 |
children | 65b71bd21a4d |
comparison
equal
deleted
inserted
replaced
5770:a1a947d67948 | 5771:5290a3850c03 |
---|---|
3378 av_log(s->avctx, AV_LOG_ERROR, "illegal short ref in memory management control operation %d\n", mmco); | 3378 av_log(s->avctx, AV_LOG_ERROR, "illegal short ref in memory management control operation %d\n", mmco); |
3379 return -1; | 3379 return -1; |
3380 }*/ | 3380 }*/ |
3381 } | 3381 } |
3382 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | 3382 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ |
3383 unsigned int long_index= get_ue_golomb(gb); | 3383 unsigned int long_arg= get_ue_golomb(gb); |
3384 if(/*h->mmco[i].long_arg >= h->long_ref_count || h->long_ref[ h->mmco[i].long_arg ] == NULL*/ long_index >= 16){ | 3384 if(/*h->mmco[i].long_arg >= h->long_ref_count || h->long_ref[ h->mmco[i].long_arg ] == NULL*/ long_arg >= 16){ |
3385 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); | 3385 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
3386 return -1; | 3386 return -1; |
3387 } | 3387 } |
3388 h->mmco[i].long_arg= long_index; | 3388 h->mmco[i].long_arg= long_arg; |
3389 } | 3389 } |
3390 | 3390 |
3391 if(opcode > (unsigned)MMCO_LONG){ | 3391 if(opcode > (unsigned)MMCO_LONG){ |
3392 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); | 3392 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
3393 return -1; | 3393 return -1; |