Merge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 11:57:08 +0000 (12:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 12:08:42 +0000 (13:08 +0100)
commit714ff44858a07578e592dfabd9e1f0a5edbf80bf
tree4cb4d03407e52ad0ca4a170eff7e95c1eadf095d
parent4ba35194a9d79b80a606aafe8744d82de5b4bcf4
parent067432c1c95882c7221e694f33d9f3bdbe46de7f
Merge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'

* commit '067432c1c95882c7221e694f33d9f3bdbe46de7f':
  loco: check that there is data left after decoding a plane.
  lagarith: avoid infinite loop in lag_rac_refill()

Conflicts:
libavcodec/loco.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/lagarithrac.h
libavcodec/loco.c