Merge commit 'ac9d159015a88aa2721b271875d18482f713f354'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 11:25:03 +0000 (13:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 11:42:20 +0000 (13:42 +0200)
commite0fcd0294e2f6cc9a3ade974a561be54c9efbc31
treedff29a73a360ba80397e09ec3855746c87e55fde
parent18e0dd05df136ce049b9827367bbf680a2c12d89
parentac9d159015a88aa2721b271875d18482f713f354
Merge commit 'ac9d159015a88aa2721b271875d18482f713f354'

* commit 'ac9d159015a88aa2721b271875d18482f713f354':
  proresdec: Properly make sure an index doesn't run past the limit

Conflicts:
libavcodec/proresdec_lgpl.c

See: 30df9789a9745d8e4b1afc10d1a983bfc8816eb9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/proresdec_lgpl.c