Mercurial > libavcodec.hg

changeset 1555:27073c5532dc libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move blocks away MpegEncContext (7.4 -> 5.8k)
author michael
date Wed, 22 Oct 2003 12:01:21 +0000
parents d736e24bf303
children 5ebb4ae753d3
files mpegvideo.c mpegvideo.h
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mpegvideo.c	Wed Oct 22 11:23:39 2003 +0000
+++ b/mpegvideo.c	Wed Oct 22 12:01:21 2003 +0000
@@ -448,6 +448,7 @@
         CHECKED_ALLOCZ(s->q_intra_matrix16, 64*32*2 * sizeof(uint16_t))
         CHECKED_ALLOCZ(s->q_inter_matrix16, 64*32*2 * sizeof(uint16_t))
     }
+    CHECKED_ALLOCZ(s->blocks, 64*6*2 * sizeof(DCTELEM))
         
     CHECKED_ALLOCZ(s->picture, MAX_PICTURE_COUNT * sizeof(Picture))
 
@@ -569,6 +570,7 @@
     av_freep(&s->q_inter_matrix);
     av_freep(&s->q_intra_matrix16);
     av_freep(&s->q_inter_matrix16);
+    av_freep(&s->blocks);
 
     for(i=0; i<MAX_PICTURE_COUNT; i++){
         free_picture(s, &s->picture[i]);
--- a/mpegvideo.h	Wed Oct 22 11:23:39 2003 +0000
+++ b/mpegvideo.h	Wed Oct 22 12:01:21 2003 +0000
@@ -657,7 +657,7 @@
     uint8_t *ptr_lastgob;
     
     DCTELEM (*block)[64]; ///< points to one of the following blocks 
-    DCTELEM blocks[2][6][64] __align8; // for HQ mode we need to keep the best block
+    DCTELEM (*blocks)[6][64]; // for HQ mode we need to keep the best block
     int (*decode_mb)(struct MpegEncContext *s, DCTELEM block[6][64]); // used by some codecs to avoid a switch()
 #define SLICE_OK         0
 #define SLICE_ERROR     -1