Merge commit '7b337b122959b9bf634c31b549892df974f35b40' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 15:16:58 +0000 (16:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 15:16:58 +0000 (16:16 +0100)
commitc693ccb89a9ed81b90901d958f8e72a7179c7242
treeaf12df8e99689719d1739ec9685d38e4ad5fd205
parent7e343798976991f4320c1c90b8d4fac4c2f9e355
parent7b337b122959b9bf634c31b549892df974f35b40
Merge commit '7b337b122959b9bf634c31b549892df974f35b40' into release/1.1

* commit '7b337b122959b9bf634c31b549892df974f35b40':
  truemotion1: make sure index does not go out of bounds
  pcx: round up in bits->bytes conversion in a buffer size check
  omadec: Fix wrong number of array elements
  omadec: check GEOB sizes against buffer size
  ac3dec: fix outptr increment.
  avio: Use AVERROR_PROTOCOL_NOT_FOUND

Conflicts:
libavcodec/ac3dec.c
libavcodec/pcx.c
libavformat/omadec.c

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