Merge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 01:46:45 +0000 (02:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 01:47:46 +0000 (02:47 +0100)
commit6a4cc50980783013b19bfb2edaaca14cc38d5c92
tree44d8de6a502cb408b8ba97f8aaafabf5db4d2941
parent2b88cb2f4653e76ba58848ce2564a22501c9c4e9
parent4c3e1956ee35fdcc5ffdb28782050164b4623c0b
Merge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'

* commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b':
  lagarith: reallocate rgb_planes when needed

Conflicts:
libavcodec/lagarith.c

See: 9eef41b848939a0a86582afdb45235e41612d9ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/lagarith.c