ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cf95654ac90214bbec9904f7e96525799172db9
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
