[FFmpeg-cvslog] Merge commit '380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  3 12:46:01 2015 +0200| [cda503a1b92c776cd197ec5a8879b793d9deaad8] | committer: Hendrik Leppkes

Merge commit '380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8'

* commit '380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8':
  x264: Add option to force IDR frames

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

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