FFmpeg/libavcodec
Michael Niedermayer 8a77baae6e Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d'
* commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d':
  lavc: do not force the emu edge flag

Conflicts:
	libavcodec/utils.c

There should be no such bugs in ffmpeg, but merging it anyway
as its safer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 21:26:13 +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
2014-01-21 11:57:43 +01:00
2014-01-21 11:58:52 +01:00
2014-01-02 22:07:09 +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