[FFmpeg-cvslog] Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 14:44:33 2014 +0200| [42b7bda41a4f7717d41b576e184da2875f7972f2] | committer: Michael Niedermayer

Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'

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

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42b7bda41a4f7717d41b576e184da2875f7972f2
---