Merge commit '0e9c4fe254073b209970df3e3cb84531bc388e99'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:54:20 +0000 (16:54 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:54:20 +0000 (16:54 +0000)
commit730d2aabacd679fd44f770959877b3c6a5d80f0e
tree941c1c5021576538835d7f84ad13268d64fbdd71
parent43c0298208ad6fe36a4dbf03824842d89c3ed143
parent0e9c4fe254073b209970df3e3cb84531bc388e99
Merge commit '0e9c4fe254073b209970df3e3cb84531bc388e99'

* commit '0e9c4fe254073b209970df3e3cb84531bc388e99':
  lavc: Move pre_me to codec private options

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