diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2006-07-27 20:37:21 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2006-07-27 20:37:21 +0000 |
| commit | ae08a5631e430b59f806c15bbcc80996a6fa7a49 (patch) | |
| tree | 134cc9e160b8b7db1e6d0164962e124471ca94a8 /libavcodec/h264.c | |
| parent | e50bc5a4ea259646f95af01d1b9d21699c8758ae (diff) | |
| download | ffmpeg-ae08a5631e430b59f806c15bbcc80996a6fa7a49.tar.gz | |
10l in r5768 (broke mbaff)
Originally committed as revision 5831 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 464ac80041..1a7fb76b49 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -841,7 +841,7 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){ assert((!left_type[0]) == (!left_type[1])); } - if(for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) + if((for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) && !FRAME_MBAFF) continue; if(USES_LIST(topleft_type, list)){ @@ -864,7 +864,7 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){ h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; } - if(IS_SKIP(mb_type) || IS_DIRECT(mb_type)) + if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF) continue; h->ref_cache[list][scan8[5 ]+1] = |