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

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Sep  7 13:49:23 2013 +0200| [dfe0ba46bf484b8b64cd7584353e97ea18912c13] | committer: Michael Niedermayer

Merge commit 'aade60ab165716523788cd11caf03ae61b40144a' into release/1.1

* commit 'aade60ab165716523788cd11caf03ae61b40144a':
  matroskadec: Check that .lang was allocated and set before reading it
  alac: Limit max_samples_per_frame
  ape demuxer: check for EOF in potentially long loops
  4xm: check that bits per sample is strictly positive
  lavf: avoid integer overflow when estimating bitrate
  pictordec: pass correct context to avpriv_request_sample

Conflicts:
	libavcodec/pictordec.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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