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