ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Aug 3
20:53:00 2014 +0200| [9400603140db5f44f35942482a3435e4b67e7e79] | committer:
Michael Niedermayer
Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'
* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
avcodec: Deprecate unused defines and options
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9400603140db5f44f35942482a3435e4b67e7e79
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
