Merge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 19:09:49 +0000 (20:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 19:13:07 +0000 (20:13 +0100)
commitf955abe33321f2e28617a3db196be705c5453219
treecb52e6955ea77cab0132456523b801447be66147
parentb04cbbe25555e5026bbe9cdc5f13ceaeeee3e535
parente71149a7a5b10ed7baa5a06f47d0313c7bd8df52
Merge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'

* commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52':
  nuv: validate image size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/nuv.c