Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 14:42:05 +0000 (15:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 14:42:05 +0000 (15:42 +0100)
commita24aef5dfa5117008c74ee2149346eebe325349d
treebd25d7a116836aed6fc274ba61415e199cb40e1e
parent2cfdc2879a6cc2f956a8a1878a4a6490c58ad5c7
parent1afa8a7568ba57ad0cd2923f6e641e10d32cded4
Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'

* commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4':
  twinvq: support multiple frames per packet

Conflicts:
libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/metasound.c
libavcodec/metasound_data.c
libavcodec/twinvq.c
libavcodec/twinvq.h
libavcodec/twinvqdec.c