Merge commit 'c8462bd17f35f435192281a2ea4ce8008a7398d3' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:55:06 +0000 (13:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:55:06 +0000 (13:55 +0200)
commitd2b9da2f3797de28fda72a96bf8f06608121c6ee
tree39381af07baab573562abbf8c63a76c6a7716491
parent395538e0735e81a2efc14573e83e323c779f4b66
parentc8462bd17f35f435192281a2ea4ce8008a7398d3
Merge commit 'c8462bd17f35f435192281a2ea4ce8008a7398d3' into release/1.1

* commit 'c8462bd17f35f435192281a2ea4ce8008a7398d3':
  mp3dec: fallback to generic seeking when a TOC is not present
  svq1dec: clip motion vectors to the frame size.
  svq1dec: check that the reference frame has the same dimensions as the current one
  qdm2: check that the FFT size is a power of 2

Conflicts:
libavcodec/svq1dec.c
libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/qdm2.c
libavcodec/svq1dec.c
libavformat/mp3dec.c