Merge commit '9580818c5d934bde65a95efd2cee61c174721092'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 13:42:26 +0000 (15:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 13:51:55 +0000 (15:51 +0200)
commitd5ec1ddf7bb0beb65319c749afc8fba2798a8ee1
tree773623f7aadf7b6f365b5024092c44489ed0affd
parent22ffa5390f6b4bb99fc6cd1fb0f629f6c3a9ba8d
parent9580818c5d934bde65a95efd2cee61c174721092
Merge commit '9580818c5d934bde65a95efd2cee61c174721092'

* commit '9580818c5d934bde65a95efd2cee61c174721092':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:
ffmpeg.c
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c