Merge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 13:55:48 +0000 (14:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jan 2013 13:55:48 +0000 (14:55 +0100)
* commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84':
  rtpdec/srtp: Handle CSRC fields being present
  rtpdec: Check the return value from av_new_packet
  ac3dec: fix non-optimal dithering of zero bit mantissas

Conflicts:
libavcodec/ac3dec.c
libavformat/rtpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/ac3dec.c
libavformat/rtpdec.c
libavformat/srtp.c

@@@ -442,8 -442,9 +442,9 @@@ static void ac3_decode_transform_coeffs
          int mantissa;
          switch (bap) {
          case 0:
+             /* random noise with approximate range of -0.707 to 0.707 */
              if (dither)
 -                mantissa = (av_lfg_get(&s->dith_state) / 362) - 5932275;
 +                mantissa = (((av_lfg_get(&s->dith_state)>>8)*181)>>8) - 5931008;
              else
                  mantissa = 0;
              break;
Simple merge
Simple merge