Michael Niedermayer
9621646eb3
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: prettyprint gcc inline asm
x86: K&R prettyprinting cosmetics for dsputil_mmx.c
x86: conditionally compile H.264 QPEL optimizations
dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
Ignore generated files below doc/.
dpcm: convert to bytestream2.
interplayvideo: convert to bytestream2.
movenc: Merge if statements
h264: fix memleak in error path.
pthread: Immediately release all frames in ff_thread_flush()
h264: Add check for invalid chroma_format_idc
utvideo: port header reading to bytestream2.
Conflicts:
.gitignore
configure
libavcodec/h264_ps.c
libavcodec/interplayvideo.c
libavcodec/pthread.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-25 23:10:30 +02:00
..
2011-10-21 02:01:26 +02:00
2012-02-11 01:22:22 +01:00
2012-01-11 22:30:21 +01:00
2012-01-28 07:53:34 +01:00
2011-10-19 20:26:55 +02:00
2012-03-15 22:12:02 +01:00
2011-10-30 21:50:08 +01:00
2012-01-28 09:06:03 +01:00
2012-03-25 23:10:30 +02:00
2012-02-16 01:34:37 +01:00
2012-03-22 19:28:52 +01:00
2012-03-17 20:48:56 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 09:06:03 +01:00
2011-11-16 07:48:23 +01:00
2011-10-30 21:50:08 +01:00
2012-02-10 01:20:07 +01:00
2012-02-10 01:20:07 +01:00
2012-03-12 21:54:37 +01:00
2012-02-10 01:20:07 +01:00
2012-02-10 01:20:07 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2012-01-27 10:19:57 +08:00
2012-01-28 07:53:34 +01:00
2012-02-28 03:38:58 +01:00
2012-02-21 05:10:12 +01:00
2012-01-09 03:32:06 +01:00
2012-02-08 05:53:35 +01:00
2012-02-09 01:27:12 +01:00
2012-01-28 07:53:34 +01:00
2012-02-12 18:56:06 +01:00
2012-02-09 01:27:12 +01:00
2012-03-02 10:33:05 -08:00
2012-03-08 02:51:45 +01:00
2012-01-27 10:19:57 +08:00
2012-01-28 07:53:34 +01:00
2012-02-12 18:56:06 +01:00
2012-02-10 01:20:07 +01:00
2012-02-09 12:26:45 +01:00
2012-02-12 21:42:31 +01:00
2012-03-25 23:10:30 +02:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-31 02:46:26 +01:00
2012-02-10 23:18:52 +01:00
2011-10-21 02:01:26 +02:00
2012-02-12 21:42:31 +01:00
2012-02-20 14:58:25 -08:00
2012-01-17 08:41:39 +01:00
2012-02-20 14:58:25 -08:00
2012-02-03 20:42:30 +01:00
2012-02-23 15:50:09 -08:00
2012-03-24 10:59:43 +01:00
2012-02-22 02:24:18 +01:00
2012-02-12 21:42:31 +01:00
2012-03-24 14:54:06 +01:00
2011-12-12 01:25:37 +01:00
2012-01-28 07:53:34 +01:00
2012-03-05 00:15:55 +01:00
2012-03-11 01:12:52 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 12:00:48 -08:00