Michael Niedermayer eef74b2e97 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>

2014-01-20 18:55:22 +01:00

69 KiB

Raw Blame History

View Raw