[FFmpeg-cvslog] Merge commit '187105ff8a02bafc9c58d9d8363bb3f55a415635'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 10:38:48 2013 +0200| [ff4548f223fc3021aad5ea5e23c86712e972f48e] | committer: Michael Niedermayer

Merge commit '187105ff8a02bafc9c58d9d8363bb3f55a415635'

* commit '187105ff8a02bafc9c58d9d8363bb3f55a415635':
  Fix references to deleted avcodec_encode_video() function

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

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