Merge remote-tracking branch 'x264/master'
authorPhillip Blucas <pblucas@gmail.com>
Tue, 22 May 2012 22:07:18 +0000 (17:07 -0500)
committerPhillip Blucas <pblucas@gmail.com>
Tue, 22 May 2012 22:07:18 +0000 (17:07 -0500)
1  2 
common/common.c
common/common.h
common/frame.c
common/macroblock.c
encoder/encoder.c
encoder/slicetype.c
x264.c
x264.h

diff --cc common/common.c
Simple merge
diff --cc common/common.h
Simple merge
diff --cc common/frame.c
@@@ -357,12 -357,9 +357,12 @@@ int x264_frame_copy_picture( x264_t *h
      dst->i_pic_struct = src->i_pic_struct;
      dst->extra_sei  = src->extra_sei;
      dst->opaque     = src->opaque;
-     dst->mb_info    = src->prop.mb_info;
-     dst->mb_info_free = src->prop.mb_info_free;
+     dst->mb_info    = h->param.analyse.b_mb_info ? src->prop.mb_info : NULL;
+     dst->mb_info_free = h->param.analyse.b_mb_info ? src->prop.mb_info_free : NULL;
  
 +    dst->b_tff            = src->b_tff;
 +    dst->b_rff            = src->b_rff;
 +
      uint8_t *pix[3];
      int stride[3];
      if ( i_csp >= X264_CSP_BGR )
Simple merge
Simple merge
Simple merge
diff --cc x264.c
Simple merge
diff --cc x264.h
Simple merge