[FFmpeg-cvslog] Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 14:55:26 2014 +0200| [1f40536ccaeac488fb0766da7ed05a13bf5263ba] | committer: Michael Niedermayer

Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'

* commit '650a5206a944fd36a42d92f98e745972056b1f7c':
  avconv: rename 'icodec' to 'dec_ctx'

Conflicts:
	ffmpeg.c

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

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