[FFmpeg-cvslog] Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 15:03:52 2014 +0200| [1efc08921868c882427444e2beb9832e221b24cd] | committer: Michael Niedermayer

Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'

* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
  avconv: rename 'codec' to 'enc_ctx'

Conflicts:
	ffmpeg.c

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

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