[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 20 18:55:22 2014 +0100| [eef74b2e97139d8422f76a0f8241aed17fc0617d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eef74b2e97139d8422f76a0f8241aed17fc0617d
---