summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-21 23:49:53 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-21 23:49:53 +0000
commit53c193a9b06c0e6ffee9b5b35ee0cc8be3c24604 (patch)
tree7e8a8bdd45f7ffad4e72e8c5aa60139358a24084
parenta0ad40832f4c21b579ff4676dd6302d8a78b70ea (diff)
Correct comment in the direct mode code.
(note, yes this is unrelated to the previous simplification, the code always behaved like it is documented now.) Originally committed as revision 15378 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f188d5bb1c..81f7e75c6a 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -987,7 +987,7 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){
#define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
if(IS_INTERLACED(h->ref_list[1][0].mb_type[mb_xy])){ // AFL/AFR/FR/FL -> AFL/FL
- if(!IS_INTERLACED(*mb_type)){ // AFR/FR -> AFL
+ if(!IS_INTERLACED(*mb_type)){ // AFR/FR -> AFL/FL
int cur_poc = s->current_picture_ptr->poc;
int *col_poc = h->ref_list[1]->field_poc;
int col_parity = FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc);