aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/error.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-27 20:42:09 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-27 20:43:25 +0200
commit59b009411fcc8531d661a381bbd2608e36c20bd0 (patch)
tree30967bc87c1054b95f2e3837c285a6d3e9c08b93 /libavutil/error.h
parentc7074375724e85e889ddaff68d150c12a90b4300 (diff)
parent03eb55741427c6608f63972c105e565ca0ba4f15 (diff)
downloadffmpeg-59b009411fcc8531d661a381bbd2608e36c20bd0.tar.gz
Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
* commit '03eb55741427c6608f63972c105e565ca0ba4f15': wmv2enc: Check memory allocation Conflicts: libavcodec/wmv2enc.c See: 6e8fe448154e1aa0928cb0d2e1aecb7255c751cc Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil/error.h')
0 files changed, 0 insertions, 0 deletions