Merge commit '1b0082eabcc98e079d33c61da4d30ded89de68a9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Mar 2013 10:56:42 +0000 (11:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Mar 2013 10:56:42 +0000 (11:56 +0100)
commitb3c8fd1f0e48ab6cd3c7c0e3f36d55152de623ec
treed17bad6d8e1b747a388f2cb200f7cae50e47f536
parent7327505883b11d6cf6e16576b04cc0cfa3ec9335
parent1b0082eabcc98e079d33c61da4d30ded89de68a9
Merge commit '1b0082eabcc98e079d33c61da4d30ded89de68a9' into release/1.1

* commit '1b0082eabcc98e079d33c61da4d30ded89de68a9':
  flvdec: Don't read the VP6 header byte when setting codec type based on metadata
  vorbisdec: Accept 0 amplitude_bits
  vorbisdec: Error on bark_map_size equal to 0.
  vorbisdec: Add missing checks
  ac3dec: validate channel output mode against channel count

Conflicts:
libavcodec/ac3dec.c
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec.c
libavcodec/vorbisdec.c
libavformat/flvdec.c