Merge commit '5cdefc02079a5b899bdec09e15e2bb099cb01734'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 10:44:06 +0000 (12:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 10:44:06 +0000 (12:44 +0200)
commit257f11820bdf628648466ce07ee0bf67217b543e
treef328a91c1c7ba8349981596199484e768d1d2e3f
parentb26ccf218d933660c551832b4b14976b2acb3f0c
parent5cdefc02079a5b899bdec09e15e2bb099cb01734
Merge commit '5cdefc02079a5b899bdec09e15e2bb099cb01734'

* commit '5cdefc02079a5b899bdec09e15e2bb099cb01734':
  aacdec: Add support for Error Resilience syntax.

Conflicts:
Changelog
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/aacdec.c