[FFmpeg-cvslog] Merge commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu Jan 28 15:08:10 2016 +0000| [13be46c08e59141408f1a7afd4737826afa87f11] | committer: Derek Buitenhuis

Merge commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7'

* commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7':
  lavc: Move frame_skip_* to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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