[FFmpeg-cvslog] Merge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 14:55:48 2013 +0100| [acc0c0190bd6144d921397d53e928532a8d86de0] | committer: Michael Niedermayer

Merge commit 'f53490cc0c809975f8238d5a9edbd26f83bd2f84'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acc0c0190bd6144d921397d53e928532a8d86de0
---