Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 13:42:29 +0000 (15:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 13:42:29 +0000 (15:42 +0200)
commit1a5871d1bec6863dfee05c9cc8b97e2307530ce6
tree21cc127f9296bc678848bdbbe31733b4ea800f12
parent8be1120deb2b6bb7c5762071a116163d204d6ca8
parentc4f7bee0872d5e2e0e91673dd4b0f18de4a3d866
Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'

* commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866':
  lavc: deprecate unused mb_threshold field

Conflicts:
libavcodec/options_table.h

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