ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Apr 24
20:49:20 2015 +0200| [036162a3787044cd82b6fa4e73eb56ddf2e57c96] | committer:
Michael Niedermayer
Merge commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9'
* commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9':
internal: Make dlog/tlog a no-op when disabled
Conflicts:
libavcodec/internal.h
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=036162a3787044cd82b6fa4e73eb56ddf2e57c96
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
