Merge commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:05:04 +0000 (00:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:05:18 +0000 (00:05 +0100)
commit12d6bbf7cbcce742a8a7a0fc55ceca308da49789
tree5e2ecc0c004319a6acc1a0e02da4fb0933547a9b
parent0d801c0bfdecd721c48f6665f7d0d80930c46f71
parent1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4
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@gmx.at>
libavcodec/svq1dec.c