Merge commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 08:38:55 +0000 (10:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 08:39:00 +0000 (10:39 +0200)
commit75835abe910f686cc8dda1fc1ac147f412ecdeda
treee41a919001633fe4df625ce8f99412499144e8c7
parent5692ad00f4881891c67a92bbf2ccc0c601fa3705
parent7c57a582a03fb473091a88737ab92b9f2a5bb87a
Merge commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a'

* commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a':
  jpeg2000dec: don't use deprecated PIX_FMT values

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