Merge commit '59846452af762f6af5ced4399e8dcd709ca50fcd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:53:14 +0000 (14:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:54:06 +0000 (14:54 +0100)
* commit '59846452af762f6af5ced4399e8dcd709ca50fcd':
  svq1enc: check ff_get_buffer return value

Conflicts:
libavcodec/svq1enc.c

See: 7effc26ba74717bb9c808d96791c7cf98911d1a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge