[FFmpeg-cvslog] Merge commit '7b337b122959b9bf634c31b549892df974f35b40' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 12 16:16:58 2014 +0100| [c693ccb89a9ed81b90901d958f8e72a7179c7242] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c693ccb89a9ed81b90901d958f8e72a7179c7242
---