-
Michael Niedermayer authored
* commit '6f7a3283': svq1enc: correctly handle memory error and allocations Conflicts: libavcodec/svq1enc.c See: 79888388Merged-by: Michael Niedermayer <michaelni@gmx.at>
acfb4ede
* commit '6f7a3283': svq1enc: correctly handle memory error and allocations Conflicts: libavcodec/svq1enc.c See: 79888388Merged-by: Michael Niedermayer <michaelni@gmx.at>