-
Michael Niedermayer authored
* commit '3beb9cba': roqvideo: check memory allocations and propagate errors Conflicts: libavcodec/roqvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
bb7ad47d
* commit '3beb9cba': roqvideo: check memory allocations and propagate errors Conflicts: libavcodec/roqvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>