Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 17:55:22 +0000 (18:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 17:55:22 +0000 (18:55 +0100)
commiteef74b2e97139d8422f76a0f8241aed17fc0617d
treea3b2851c96fbe1cd527f1444c9bcdd47cfe99e61
parent8001e9f7d17e90b4b0898ba64e3b8bbd716c513c
parent93c553c71ef48550ff7c2aa7b5712a7e01f1999f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().

Conflicts:
doc/APIchanges
libavcodec/utils.c
libavcodec/version.h

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