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

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 13:55:06 2013 +0200| [d2b9da2f3797de28fda72a96bf8f06608121c6ee] | committer: Michael Niedermayer

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

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