[FFmpeg-cvslog] Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  5 09:45:29 2013 +0200| [48af87819a035816f2fd0270d4ac3e54143a86a2] | committer: Michael Niedermayer

Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65'

* commit '71953ebcf94fe4ef316cdad1f276089205dd1d65':
  aac: Check init_get_bits return value

Conflicts:
	libavcodec/aacdec.c

See: 73abc3a634d84e4cc8951787323b594c5476e4a8

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

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