Michael Niedermayer
bff2afb3e9
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
x86: dsputil: Only compile motion_est code when encoders are enabled
mem: fix typo in check for __ICC
fate: mp3: drop redundant CMP setting
rtp: Depacketization of JPEG (RFC 2435)
Rename ff_put_string to avpriv_put_string
mjpeg: Rename some symbols to avpriv_* instead of ff_*
yadif: cosmetics
Conflicts:
Changelog
libavcodec/mjpegenc.c
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/version.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 14:06:20 +02:00
2012-09-09 13:27:42 +02:00
2012-08-31 15:39:03 +02:00
2012-08-14 15:34:39 +02:00
2012-09-08 12:53:44 +02:00
2012-08-31 13:34:32 +02:00
2012-08-07 23:04:55 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-08-09 19:31:56 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-08-31 13:34:32 +02:00
2012-09-09 13:27:42 +02:00
2012-08-13 14:38:43 +02:00
2012-08-09 19:31:56 +02:00
2012-08-29 18:04:34 +02:00
2012-09-09 13:27:42 +02:00
2012-08-31 13:34:32 +02:00
2012-08-03 23:13:06 +02:00
2012-09-09 13:27:42 +02:00
2012-08-07 23:04:55 +02:00
2012-08-31 01:53:25 +02:00
2012-08-07 23:04:55 +02:00
2012-08-31 15:39:03 +02:00
2012-08-31 15:39:03 +02:00
2012-08-14 15:34:39 +02:00
2012-08-31 13:34:32 +02:00
2012-08-07 23:04:55 +02:00
2012-08-31 13:34:32 +02:00
2012-09-09 13:27:42 +02:00
2012-08-07 23:04:55 +02:00
2012-08-07 15:20:56 +01:00
2012-08-31 13:34:32 +02:00
2012-08-07 15:20:56 +01:00
2012-08-07 23:04:55 +02:00
2012-09-09 17:21:02 +02:00
2012-08-16 16:20:30 +02:00
2012-08-09 19:31:56 +02:00
2012-08-16 17:26:06 +02:00
2012-08-31 15:39:03 +02:00
2012-09-08 12:53:44 +02:00
2012-09-10 14:06:20 +02:00
2012-08-09 19:31:56 +02:00
2012-09-09 13:27:42 +02:00
2012-08-29 18:04:34 +02:00
2012-09-09 18:39:03 +02:00
2012-08-24 14:30:40 +02:00
2012-08-29 18:13:00 +02:00
2012-09-09 13:27:42 +02:00
2012-09-09 13:27:42 +02:00
2012-08-08 15:45:09 +02:00
2012-09-09 13:27:42 +02:00
2012-08-31 15:39:03 +02:00
2012-09-08 18:18:34 +02:00
2012-08-07 15:21:20 +01:00
2012-09-09 13:27:42 +02:00
2012-08-07 15:21:20 +01:00
2012-09-08 18:18:34 +02:00
2012-08-29 18:04:34 +02:00
2012-08-29 18:04:34 +02:00
2012-09-01 10:59:16 +02:00
2012-08-31 15:39:03 +02:00
2012-08-31 13:01:30 +02:00
2012-08-13 14:38:43 +02:00
2012-09-09 13:27:42 +02:00
2012-07-29 02:16:26 +02:00
2012-08-31 13:01:30 +02:00
2012-08-07 23:04:55 +02:00
2012-09-06 16:23:17 +02:00
2012-09-09 13:27:42 +02:00
2012-08-07 23:04:55 +02:00
bff2afb3e9