-
Michael Niedermayer authored
* commit 'f3a6ad22': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
42b7bda4
* commit 'f3a6ad22': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by:Michael Niedermayer <michaelni@gmx.at>