* commit '21aeae9c679657a1537d0d9127eff280bafc901a': svq1enc: check ff_get_buffer return value Conflicts: libavcodec/svq1enc.c See: 7effc26ba7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
7effc26ba7