diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-17 21:43:08 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-17 21:43:08 +0000 |
| commit | f432b43b0807fd86ef5d691be6b2b8f918e7c6b1 (patch) | |
| tree | f1126b95ac82621750796ecc7c1dc1146b440774 /libavcodec/h264.c | |
| parent | c988f97566cdf536ba0dcbc0d77d885456852060 (diff) | |
| download | ffmpeg-f432b43b0807fd86ef5d691be6b2b8f918e7c6b1.tar.gz | |
Split fill_caches() between filter and decoder.
Originally committed as revision 21271 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 dd59ed9aa3..3f44d521fc 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1287,7 +1287,7 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ if(h->deblocking_filter && 0) { backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple); - fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb + fill_filter_caches(h, mb_type); //FIXME don't fill stuff which isn't used by filter_mb h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]); h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]); if (!simple && FRAME_MBAFF) { @@ -2184,7 +2184,7 @@ static void loop_filter(H264Context *h){ uvlinesize = h->mb_uvlinesize = s->uvlinesize; } backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, !is_complex); - fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb + fill_filter_caches(h, mb_type); //FIXME don't fill stuff which isn't used by filter_mb h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]); h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]); |