Merge remote-tracking branch 'qatar/master'

* qatar/master: (29 commits)
  cabac: Move code only used within the CABAC test program into the test program.
  vp56: Drop unnecessary cabac.h #include.
  h264-test: Initialize AVCodecContext.av_class.
  build: Skip compiling network.h and rtsp.h if networking is not enabled.
  cosmetics: drop some pointless parentheses
  Disable annoying warning without changing behavior
  faq: Solutions for common problems with sample paths when running FATE.
  avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
  avcodec: fix avcodec_encode_audio() documentation.
  FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
  vqf: recognize more metadata chunks
  FATE test: BMV demuxer and associated video and audio decoders.
  FATE: indeo4 video decoder test.
  FATE: update xxan-wc4 test to a sample with more code coverage.
  Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
  g722enc: validate AVCodecContext.trellis
  g722enc: set frame_size, and also handle an odd number of input samples
  g722enc: split encoding into separate functions for trellis vs. no trellis
  mpegaudiodec: Use clearer pointer math
  tta: Fix returned error code at EOF
  ...

Conflicts:
	libavcodec/h264.c
	libavcodec/indeo3.c
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/libxvidff.c
	libavcodec/mpegvideo.c
	libavcodec/ppc/mpegvideo_altivec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavfilter/vsrc_buffer.c
	libavformat/Makefile
	tests/fate/indeo.mak
	tests/ref/acodec/g722

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 5 insertions, 5 deletions

diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c
index 0ba532ec26..297e7fefce 100644
--- a/libavcodec/ppc/mpegvideo_altivec.c
+++ b/libavcodec/ppc/mpegvideo_altivec.c
@@ -269,14 +269,14 @@ static int dct_quantize_altivec(MpegEncContext* s,
 
             if(n<4){
                 qmat = (vector signed int*)s->q_intra_matrix[qscale];
-                biasAddr = &(s->intra_quant_bias);
+                biasAddr = &s->intra_quant_bias;
             }else{
                 qmat = (vector signed int*)s->q_chroma_intra_matrix[qscale];
-                biasAddr = &(s->intra_quant_bias);
+                biasAddr = &s->intra_quant_bias;
             }
         } else {
             qmat = (vector signed int*)s->q_inter_matrix[qscale];
-            biasAddr = &(s->inter_quant_bias);
+            biasAddr = &s->inter_quant_bias;
         }
 
         // Load the bias vector (We add 0.5 to the bias so that we're
@@ -366,8 +366,8 @@ static int dct_quantize_altivec(MpegEncContext* s,
             vector signed int max_q_int, min_q_int;
             vector signed short max_q, min_q;
 
-            LOAD4(max_q_int, &(s->max_qcoeff));
-            LOAD4(min_q_int, &(s->min_qcoeff));
+            LOAD4(max_q_int, &s->max_qcoeff);
+            LOAD4(min_q_int, &s->min_qcoeff);
 
             max_q = vec_pack(max_q_int, max_q_int);
             min_q = vec_pack(min_q_int, min_q_int);