[FFmpeg-cvslog] Merge commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 10 12:13:09 2013 +0200| [40e8967ee161a9d247419e77da745e939f0ddaf8] | committer: Michael Niedermayer

Merge commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e'

* commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e':
  atrac3: set the getbits context the right buffer_end
  atrac3: fix error handling

Conflicts:
	libavcodec/atrac3.c

No change as these issues have been fixed previously
See: c8f25cafd2f23662bcb1e62965c0c42d6989688a
See: 5eaed6d33689cc6f6e7c07463ede6b387b08afc4

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

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