Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 10:57:32 +0000 (12:57 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 10:59:05 +0000 (12:59 +0200)
commit247f4d1f181c2801b8321a7ddb88818dc4861155
tree37592f29866ffba276115808a1c896bc2c4e7bf2
parentdb3e12a828553171f37c98119679316720e4caed
parent6d5d9246042acb804a652e6fedfb7afe0ca85614
Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'

* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614':
  avconv: move handling the 2pass logfile into avconv_opt

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
ffmpeg.c
ffmpeg_opt.c