diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:19:58 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:20:30 +0100 |
commit | bb7ad47ddf94511eece7e243402e2cf95cddf1df (patch) | |
tree | 80279a5c76b9d27e4745291e341408f922848d08 /libavcodec/a64multienc.c | |
parent | 16f0618200a31e4c017ae88bf09c1e5af6c583e6 (diff) | |
parent | 3beb9cbad35218ed1fb3473eeb3cfc97a931bff4 (diff) | |
download | ffmpeg-bb7ad47ddf94511eece7e243402e2cf95cddf1df.tar.gz |
Merge commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4'
* commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4':
roqvideo: check memory allocations and propagate errors
Conflicts:
libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/a64multienc.c')
0 files changed, 0 insertions, 0 deletions