]> git.sesse.net Git - ffmpeg/commit
Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:44:44 +0000 (01:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:45:39 +0000 (01:45 +0200)
commit10531d48a0f91aea57eac7e1c6cf5857e601826e
tree26421260f81ec4463757f28e446910bf437cb02e
parent3a8b16f78e8bf35328f9d70506c1205bb258792c
parent7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8
Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8'

* commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8':
  eatgv: Check memory allocation

Conflicts:
libavcodec/eatgv.c

See: a5615b82eb116e9fd0f71f2b03c333cc31ab706a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/eatgv.c