Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 12:44:33 +0000 (14:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 12:44:33 +0000 (14:44 +0200)
commit42b7bda41a4f7717d41b576e184da2875f7972f2
treeb59e44f9c9d84be410d921400674122958949217
parent6e397074380e64b177e51d5a9ed2a96e1a5b5f7a
parentf3a6ad22c977c8fea87c4c5e4535061db6324d66
Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'

* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
  avconv: rename InputStream.opts to InputStream.decoder_opts

Conflicts:
ffmpeg.c

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