Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 02:11:21 +0000 (04:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 02:11:21 +0000 (04:11 +0200)
commitf6c524a9399f854602975c7c83c377fc7a4c0d5e
treec8b06c11db7fd2cdac568a884e8d3ada13a50959
parent78f50e7eb69437fd108c82f963e7add5e9faa36e
parent0c69164f451cc9ca6ce9d6e7568083e2776bc845
Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'

* commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845':
  h263: Convert function to macro

Conflicts:
libavcodec/h263.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/mpegvideo_enc.c
libavcodec/vaapi_mpeg4.c