Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 16:58:01 +0000 (18:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 16:58:01 +0000 (18:58 +0200)
commit9cf95654ac90214bbec9904f7e96525799172db9
treee2bc50d8dd0d2975ba6181d8edd9c0c654a96cb6
parent811008b8eeaad4b7efe7281b18e9bff89e37d470
parent007e27d363ba7d994019dc897dc9c39071bb204a
Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a'

* commit '007e27d363ba7d994019dc897dc9c39071bb204a':
  avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()

Conflicts:
libavcodec/atrac3plusdec.c
libavcodec/sp5xdec.c

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