Merge commit '2ed8a550da524434deb3b89f7ec62ed833bedac5' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 18:18:56 +0000 (19:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 18:20:29 +0000 (19:20 +0100)
commit2e57d4ba24b1c7806375ef05a56c3627a97d21db
treeea8d31d8f67a5d266cf38436585d9cb5ce8543ca
parent7c72398787316c82cc13d21fe318ec2fb8b991da
parent2ed8a550da524434deb3b89f7ec62ed833bedac5
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@gmx.at>
libavcodec/aacdec.c
libavcodec/dsicinav.c