[FFmpeg-cvslog] Merge commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep 29 14:33:35 2015 +0200| [c096226ae614ef56985f9e90370227c6ff6b917e] | committer: Hendrik Leppkes

Merge commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad'

* commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad':
  configure: mips: Support mips r6, r2 and r1

Not merge, as MIPS support in ffmpeg is handled
quite differently and I do not have an env to test.

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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