Merge commit '146b187113e3cc20c2a97c5f264da13e701ca247' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 12:45:18 +0000 (14:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 12:54:53 +0000 (14:54 +0200)
commit02018a359e05ebca8ded672166b80dad47ab2de1
tree5647522e2068d611532878570fd554e3aab926f8
parent451bc8ee2fceaf9a3290ed5a6c65b6734ab51b8c
parent146b187113e3cc20c2a97c5f264da13e701ca247
Merge commit '146b187113e3cc20c2a97c5f264da13e701ca247' into release/1.1

* commit '146b187113e3cc20c2a97c5f264da13e701ca247':
  lavc: Check the image size before calling get_buffer

Conflicts:
libavcodec/utils.c

See: 668494acd8b20f974c7722895d4a6a14c1005f1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c