ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Fri Aug
8 14:06:36 2014 +0200| [eaf64192d83270d4b3267e89c5606d385d5a1930] | committer:
Michael Niedermayer
Merge commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83' into release/1.1
* commit '3a6bc3e381647bb4434317113f131f7e0ab5bf83':
vf_select: Drop a debug av_log with an unchecked double to enum conversion
Conflicts:
libavfilter/f_select.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eaf64192d83270d4b3267e89c5606d385d5a1930
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
