Merge commit 'f875a732e36786d49f3650e3235272891a820600'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 14:26:59 +0000 (16:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 14:26:59 +0000 (16:26 +0200)
commit028f8c3ecb439899be02340bbede9472771e5392
treeb97fac00b379ba59ef74ec659259c3e5266588ac
parent8d0b899e38b7d33896b05625b195b83697fbbfd8
parentf875a732e36786d49f3650e3235272891a820600
Merge commit 'f875a732e36786d49f3650e3235272891a820600'

* commit 'f875a732e36786d49f3650e3235272891a820600':
  mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory

Conflicts:
libavcodec/mpeg4videodec.c

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