-
Michael Niedermayer authored
* commit '007e27d3': 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>
9cf95654
* commit '007e27d3': 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>