FFmpeg/libavcodec
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
..
2014-01-09 19:33:07 +01:00
2014-01-09 19:33:07 +01:00
2013-12-15 16:53:32 +01:00
2014-01-01 02:57:56 +01:00
2013-12-22 22:03:47 +01:00
2013-12-28 18:19:46 +01:00
2013-11-26 13:22:01 +01:00
2014-01-16 16:59:15 +01:00
2014-01-16 16:59:15 +01:00
2013-11-21 20:53:06 +01:00
2014-01-02 22:07:09 +01:00
2013-11-21 20:57:20 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00
2013-12-31 12:19:59 +01:00
2014-01-10 17:08:04 +01:00
2013-12-31 12:19:59 +01:00
2013-12-18 18:15:15 +01:00
2013-12-18 22:15:32 +01:00
2013-12-09 08:41:20 +01:00
2013-12-09 08:41:20 +01:00
2014-01-10 17:51:13 +01:00
2014-01-04 04:16:46 +01:00
2013-12-10 16:18:51 +01:00
2013-12-22 14:59:31 +01:00
2014-01-19 22:26:43 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00