[FFmpeg-cvslog] Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'
Michael Niedermayer
git at videolan.org
Mon Dec 16 23:25:45 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 16 22:07:24 2013 +0100| [a788949255d5fde243575b556e2950feafdc6755] | committer: Michael Niedermayer
Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'
* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
Bump major of libavfilter for reference counted buffer API changes.
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a788949255d5fde243575b556e2950feafdc6755
---
More information about the ffmpeg-cvslog
mailing list