Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 14:56:40 +0000 (16:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 14:56:40 +0000 (16:56 +0200)
commite40ae8cc00ae7e485a64a5b3b40b73dbfd32b631
tree4d1174389c3fc1fb3d8e1dafd0e6b7ba6fc4655f
parent185164398763b76729d6169bea35d08c48d1d32f
parent6484149158b6fc6d13d2b2ef84cb26a2d3275400
Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400':
  lavc: make the xvid-specific "gmc" flag a private option of libxvid

Conflicts:
libavcodec/libxvid.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/libxvid.c
libavcodec/options_table.h
libavcodec/version.h