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-20 13:10:10 +01:00
2014-01-20 18:55:22 +01:00
2013-12-14 21:47:51 +01:00
2014-01-09 12:12:10 +01:00
2013-11-28 10:27:25 +01:00
2013-12-23 12:52:50 +01:00
2014-01-09 12:12:10 +01:00
2013-11-10 02:33:33 +01:00
2014-01-19 13:40:32 +01:00
2014-01-03 17:05:44 +01:00
2014-01-08 09:47:53 +01:00
2014-01-09 12:12:10 +01:00
2014-01-09 12:12:10 +01:00
2013-12-15 10:46:46 +01:00
2013-12-16 19:18:45 +01:00
2014-01-03 17:03:43 +01:00
2013-12-29 22:57:20 +01:00
2014-01-19 12:20:10 +01:00
2014-01-09 12:12:10 +01:00
2014-01-09 19:33:07 +01:00
2013-11-14 09:51:10 +01:00
2014-01-20 13:10:10 +01:00
2014-01-19 13:40:37 +01:00
2013-12-12 18:21:52 -09:00
2013-11-27 13:39:42 +00:00
2014-01-05 00:43:51 +01:00
2013-12-18 09:18:42 -05:00
2013-12-01 21:50:13 +01:00
2013-12-06 10:40:38 +01:00
2013-12-09 21:21:36 +01:00