ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sun 
Jul 19 13:33:44 2015 +0200| [edd110ee4526849da487bb6be9c63fc77cb5a65a] | 
committer: Michael Niedermayer

Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'

* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
  avconv: use read_file() for reading the 2pass stats

Conflicts:
        cmdutils.c
        cmdutils.h
        ffmpeg_opt.c

Merged-by: Michael Niedermayer <mich...@niedermayer.cc>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to