ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun
Jul 19 12:57:32 2015 +0200| [247f4d1f181c2801b8321a7ddb88818dc4861155] |
committer: Michael Niedermayer
Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'
* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614':
avconv: move handling the 2pass logfile into avconv_opt
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=247f4d1f181c2801b8321a7ddb88818dc4861155
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
