Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 18:42:09 +0000 (20:42 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 18:43:25 +0000 (20:43 +0200)
commit59b009411fcc8531d661a381bbd2608e36c20bd0
tree30967bc87c1054b95f2e3837c285a6d3e9c08b93
parentc7074375724e85e889ddaff68d150c12a90b4300
parent03eb55741427c6608f63972c105e565ca0ba4f15
Merge commit '03eb55741427c6608f63972c105e565ca0ba4f15'

* commit '03eb55741427c6608f63972c105e565ca0ba4f15':
  wmv2enc: Check memory allocation

Conflicts:
libavcodec/wmv2enc.c

See: 6e8fe448154e1aa0928cb0d2e1aecb7255c751cc
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/wmv2enc.c