[FFmpeg-cvslog] Merge commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 00:05:04 2015 +0100| [12d6bbf7cbcce742a8a7a0fc55ceca308da49789] | committer: Michael Niedermayer

Merge commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4' into release/2.4

* commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4':
  svq1dec: Unbreak the scratch buffer allocation

Conflicts:
	libavcodec/svq1dec.c

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

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