Michael Niedermayer
64b25938e9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
dnxhdenc: add space between function argument type and comment.
x86: fmtconvert: add special asm for float_to_int16_interleave_misc_*
attributes: Add a definition of av_always_inline for MSVC
cmdutils: Pass the actual chosen encoder to filter_codec_opts
os_support: Add fallback definitions for stat flags
os_support: Rename the poll fallback function to ff_poll
network: Check for struct pollfd
os_support: Don't compare a negative number against socket descriptors
os_support: Include all the necessary headers for the win32 open function
x86: vc1: fix and enable optimised loop filter
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-06-30 22:44:18 +02:00
..
2012-06-30 22:44:18 +02:00
2012-06-29 14:54:15 +02:00
2012-06-21 22:37:43 +02:00
2012-06-23 00:30:37 +00:00
2012-06-23 00:30:37 +00:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:20:02 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 20:22:04 +02:00
2012-06-22 22:47:33 +00:00
2012-06-29 01:58:34 +00:00
2012-06-21 22:37:43 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 13:31:44 +02:00
2012-06-28 22:26:15 +02:00
2012-06-29 14:54:15 +02:00
2012-06-23 00:30:37 +00:00
2012-06-30 22:44:18 +02:00
2012-06-26 11:59:24 +03:00
2012-06-28 01:08:52 +02:00
2012-06-23 00:30:37 +00:00
2012-06-29 14:54:15 +02:00
2012-06-23 01:38:47 +02:00
2012-06-23 01:38:47 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 14:54:15 +02:00
2012-06-24 21:34:54 +02:00
2012-06-25 23:10:45 +02:00
2012-06-25 23:10:45 +02:00
2012-06-28 22:25:38 +02:00
2012-06-29 14:54:15 +02:00
2012-06-26 13:12:12 +02:00
2012-06-23 01:38:47 +02:00
2012-06-22 21:50:50 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 14:54:15 +02:00
2012-06-23 00:29:34 +00:00
2012-06-22 22:34:02 +02:00
2012-06-23 00:30:37 +00:00
2012-06-28 00:07:10 +02:00
2012-06-28 00:07:22 +02:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:20:02 +02:00
2012-06-29 14:54:15 +02:00
2012-06-23 01:38:47 +02:00
2012-06-24 20:20:23 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 14:54:15 +02:00
2012-06-28 01:08:52 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 14:54:15 +02:00
2012-06-23 00:42:51 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-23 01:38:47 +02:00
2012-06-24 20:18:00 +02:00
2012-06-23 00:30:37 +00:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:21:28 +02:00
2012-06-26 09:54:30 +02:00
2012-06-29 14:54:15 +02:00
2012-06-21 22:37:43 +02:00
2012-06-21 19:49:37 +02:00
2012-06-23 21:12:29 +02:00
2012-06-23 21:12:29 +02:00
2012-06-22 17:23:09 +02:00
2012-06-22 17:23:09 +02:00
2012-06-26 00:38:05 +02:00
2012-06-29 14:54:15 +02:00
2012-06-21 22:37:43 +02:00
2012-06-30 20:44:01 +02:00
2012-06-22 22:34:02 +02:00
2012-06-21 19:49:37 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:43:30 +02:00
2012-06-30 20:16:39 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 01:58:34 +00:00
2012-06-29 01:58:34 +00:00
2012-06-29 01:58:34 +00:00
2012-06-29 01:58:34 +00:00