ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Wed Jul
30 20:33:24 2014 +0200| [75ff0e8c50d12c40170a21479ac07f573952cdf2] | committer:
Michael Niedermayer
Merge commit '01a550bda29eb05fb230576e5223034974aa3396' into release/2.2
* commit '01a550bda29eb05fb230576e5223034974aa3396':
vf_select: Drop a debug av_log with an unchecked double to enum conversion
Conflicts:
libavfilter/f_select.c
See: 7994c1cd760838ca5b92401caa1994bc035d08b5
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75ff0e8c50d12c40170a21479ac07f573952cdf2
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
