Merge commit '21aeae9c679657a1537d0d9127eff280bafc901a' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:39:51 +0000 (02:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:40:01 +0000 (02:40 +0100)
commit65b2973a543366fe398e9f376fa0ec0bda030b0a
treea623139f5964050e2953daf0b17189a360812e69
parenta0bad45cd8e744a17f51b42c236715880b02eafe
parent21aeae9c679657a1537d0d9127eff280bafc901a
Merge commit '21aeae9c679657a1537d0d9127eff280bafc901a' into release/2.4

* commit '21aeae9c679657a1537d0d9127eff280bafc901a':
  svq1enc: check ff_get_buffer return value

Conflicts:
libavcodec/svq1enc.c

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