Merge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 09:24:27 +0000 (11:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 09:24:27 +0000 (11:24 +0200)
commit46cc498b77bcb058823687fc98fa6beb290324c0
treedbcfd252d771dd9a2e812f3e3131089bb61c3937
parentc1840cbdbe8c2b91ef0f7b7c50217ca9e4f6ac1a
parentd4c2a3740fb95f952a87ba320d2bf31f126bdf68
Merge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'

* commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68':
  xmv: Add more sanity checks for parameters read from the bitstream

Conflicts:
libavformat/xmv.c

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