[FFmpeg-cvslog] Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  1 15:40:47 2014 +0200| [862120f98049dc4bd0919d431a4f07a64fab77ec] | committer: Michael Niedermayer

Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'

* commit '383136264ef40452efd86cafb2d7221cd3830b3d':
  avconv: do not use the stream codec context for encoding

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

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

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