[FFmpeg-cvslog] Merge commit '67a7695c142561fe60f21adffe89c133385d37c9'

Michael Niedermayer git at videolan.org
Wed Aug 20 00:40:55 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 20 00:23:15 2014 +0200| [5a22877e9d191e1c5ab1994718d31314ce067db0] | committer: Michael Niedermayer

Merge commit '67a7695c142561fe60f21adffe89c133385d37c9'

* commit '67a7695c142561fe60f21adffe89c133385d37c9':
  avfilter: Remove unused variable from ff_get_video_buffer()

Conflicts:
	libavfilter/video.c

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

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





More information about the ffmpeg-cvslog mailing list