Merge commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 08:39:34 +0000 (10:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 08:39:34 +0000 (10:39 +0200)
commitf9ccdcb6ce0a874c81c41c2a42f609a8cdc5ddae
tree9201e8d218dbd86c009055c11f6daeed0d7a0404
parent2dd38a1d486a1abc3ccb76c963424f23d162be51
parent8411baf6f0a42bdd61f00f34aa9efec7e138b5f2
Merge commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2'

* commit '8411baf6f0a42bdd61f00f34aa9efec7e138b5f2':
  dca_parser: Handle changes in DCA frame size

Conflicts:
libavcodec/dca_parser.c

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