h264: Fix assert that failed to compile with -DDEBUG.
authorDiego Biurrun <diego@biurrun.de>
Mon, 20 Jun 2011 23:11:28 +0000 (01:11 +0200)
committerReinhard Tartler <siretart@tauware.de>
Thu, 23 Jun 2011 06:49:22 +0000 (08:49 +0200)
The assert referenced a variable that no longer exists since 4:4:4 support.
(cherry picked from commit 6371ce4b0f0535a7f576b8f109d35345e3d11d7d)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/h264.c

index dc4acb8..13a6380 100644 (file)
@@ -1682,7 +1682,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, int mb_ty
                         uint64_t tr_high;
                         if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){
                             const int topright_avail= (h->topright_samples_available<<i)&0x8000;
-                            assert(mb_y || linesize <= block_offset[i]);
+                            assert(s->mb_y || linesize <= block_offset[i]);
                             if(!topright_avail){
                                 if (pixel_shift) {
                                     tr_high= ((uint16_t*)ptr)[3 - linesize/2]*0x0001000100010001ULL;