Merge commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 15:08:10 +0000 (15:08 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 15:08:10 +0000 (15:08 +0000)
commit13be46c08e59141408f1a7afd4737826afa87f11
tree83466267710058994b498df467287a2d74a72e55
parent4f32ccb61800ef1a0acf02010784da4f15adde44
parent0ac9f33a9e69c64eee592791be3c5441a6a3d6b7
Merge commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/avcodec.h
libavcodec/libvpxenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h