Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 13:04:42 +0000 (15:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 13:04:42 +0000 (15:04 +0200)
commitc48e8d9dca550327b88106276aed17f87b23b7fe
tree22691e94c032d6390a6e1a28c3bcf2dbea2f33c0
parentfc67d937cc73fb68ab8d840e319e89c52df79c3d
parent59b55c494e01de09dfd7cbf9cbbe7223265ac283
Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'

* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283':
  lavc: deprecate unused me_threshold field

Conflicts:
ffmpeg.c

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