[FFmpeg-cvslog] Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a'
Michael Niedermayer
git at videolan.org
Wed Jul 1 19:09:14 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 1 18:58:01 2015 +0200| [9cf95654ac90214bbec9904f7e96525799172db9] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cf95654ac90214bbec9904f7e96525799172db9
---
More information about the ffmpeg-cvslog
mailing list