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)
commit709ab39cb9a4887a08ed0d8fc25c2ddc79731f85
tree94e858b94de9fd21b4d32504fa8466717306d3cd
parent1a5871d1bec6863dfee05c9cc8b97e2307530ce6
parent15ec053c4c0b198a2e93eb8e60c8f41e091e0c40
Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'

* commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40':
  lavc: make border_masking into private options of mpegvideo encoders

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