[FFmpeg-cvslog] Merge commit '2ed8a550da524434deb3b89f7ec62ed833bedac5' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 19:18:56 2013 +0100| [2e57d4ba24b1c7806375ef05a56c3627a97d21db] | committer: Michael Niedermayer

Merge commit '2ed8a550da524434deb3b89f7ec62ed833bedac5' into release/0.10

* commit '2ed8a550da524434deb3b89f7ec62ed833bedac5':
  aac: Check init_get_bits return value
  aac: return meaningful errors
  dsicinav: K&R formatting cosmetics

Conflicts:
	libavcodec/dsicinav.c

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

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