[FFmpeg-cvslog] Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'

Michael Niedermayer git at videolan.org
Mon Oct 28 13:13:25 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 13:07:05 2013 +0100| [a1ce060c5191dca1ef1927330de6ce413a402ffb] | committer: Michael Niedermayer

Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'

* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1ce060c5191dca1ef1927330de6ce413a402ffb
---





More information about the ffmpeg-cvslog mailing list