Merge commit '84c4714f397c9c50eb9d49008cc1c08385f68f31'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 14:21:33 +0000 (14:21 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 14:21:33 +0000 (14:21 +0000)
commit4f32ccb61800ef1a0acf02010784da4f15adde44
treefaf32743b2d433700e741917a60fe8fbfd68cd0a
parent2edd47582b4db2b89b821d6e809d5a4671487b0e
parent84c4714f397c9c50eb9d49008cc1c08385f68f31
Merge commit '84c4714f397c9c50eb9d49008cc1c08385f68f31'

* commit '84c4714f397c9c50eb9d49008cc1c08385f68f31':
  lavc: Move brd_scale 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