Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 13:58:52 +0000 (15:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 13:58:55 +0000 (15:58 +0200)
* commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40':
  lavc: make border_masking into private options of mpegvideo encoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avcodec.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/ratecontrol.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge