Merge commit 'aade60ab165716523788cd11caf03ae61b40144a' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Sep 2013 11:49:23 +0000 (13:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Sep 2013 11:49:23 +0000 (13:49 +0200)
commitdfe0ba46bf484b8b64cd7584353e97ea18912c13
treeac8cc77b066b6d6e484632101670e2a75af54a0f
parent6bfa823b70ec135b59e036106eb403a546145faa
parentaade60ab165716523788cd11caf03ae61b40144a
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@gmx.at>
libavcodec/alac.c
libavformat/4xm.c
libavformat/ape.c
libavformat/matroskadec.c
libavformat/utils.c