Michael Niedermayer
e387c9d5dd
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (22 commits)
rv40dsp x86: use only one register, for both increment and loop counter
rv40dsp: implement prescaled versions for biweight.
avconv: use default channel layouts when they are unknown
avconv: parse channel layout string
nutdec: K&R formatting cosmetics
vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
mem: Consistently return NULL for av_malloc(0)
vf_overlay: implement poll_frame()
vf_scale: support named constants for sws flags.
lavc doxy: add all installed headers to doxy groups.
lavc doxy: add avfft to the main lavc group.
lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
lavc doxy: add AVPicture functions to a doxy group.
lavc doxy: add resampling functions to a doxy group.
lavc doxy: replace \ with /
lavc doxy: add encoding functions to a doxy group.
lavc doxy: add decoding functions to a doxy group.
lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
lavc doxy: add AVPacket-related stuff to a separate doxy group.
lavc doxy: add core functions/definitions to a doxy group.
...
Conflicts:
ffmpeg.c
libavcodec/avcodec.h
libavcodec/vda.c
libavcodec/x86/rv40dsp.asm
libavfilter/vf_scale.c
libavformat/nutdec.c
libavutil/mem.c
tests/ref/acodec/pcm_s24daud
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-10 22:53:25 +02:00
2012-03-26 20:52:52 +02:00
2012-04-10 22:53:25 +02:00
2012-03-26 20:52:52 +02:00
2012-04-10 22:53:25 +02:00
2012-03-26 20:52:52 +02:00
2012-03-26 20:52:52 +02:00
2012-04-10 22:53:25 +02:00
2012-03-29 04:11:10 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 11:48:20 +02:00
2012-04-09 17:21:34 +02:00
2012-04-07 22:41:37 +02:00
2012-03-24 10:59:43 +01:00
2012-03-29 04:11:10 +02:00
2012-04-10 20:51:20 +02:00
2012-04-07 22:41:37 +02:00
2012-03-29 04:11:10 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-06 22:52:01 +02:00
2012-03-27 11:58:15 -04:00
2012-04-07 22:41:37 +02:00
2012-03-24 17:52:53 +01:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-06 08:32:09 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-07 22:41:37 +02:00
2012-04-10 22:53:25 +02:00
2012-04-10 22:53:25 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-24 05:44:37 +01:00
2012-03-23 11:38:53 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-29 04:11:10 +02:00
2012-04-01 00:36:43 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-03-29 04:11:10 +02:00
2012-03-25 12:22:06 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 16:35:28 +02:00
2012-04-02 21:26:08 +02:00
2012-04-07 22:41:37 +02:00
2012-04-01 16:11:29 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-25 23:10:30 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-03-28 04:12:24 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-29 04:11:10 +02:00
2012-03-29 04:11:10 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-29 04:11:10 +02:00
2012-04-10 22:53:25 +02:00
2012-04-06 22:37:38 +03:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 22:03:32 +01:00
2012-04-07 22:41:37 +02:00
2012-04-09 20:55:09 +02:00
2012-03-28 09:38:31 +02:00
2012-03-29 04:11:10 +02:00
2012-04-01 22:19:45 +02:00
2012-04-08 17:03:38 +02:00
2012-03-29 04:11:10 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-04 21:17:52 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 19:59:00 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-05 22:26:50 +02:00
2012-04-05 22:26:50 +02:00
2012-03-27 15:28:18 +02:00
2012-04-07 19:59:00 +02:00
2012-04-04 03:43:23 +02:00
2012-04-05 22:26:50 +02:00
2012-04-05 22:26:50 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-26 22:22:51 +02:00
2012-03-31 23:31:56 +02:00
2012-03-31 16:35:54 +02:00
2012-04-07 22:41:37 +02:00
2012-03-24 00:32:18 +01:00
2012-04-07 22:41:37 +02:00
2012-03-29 04:11:10 +02:00
2012-03-23 10:14:30 +01:00
2012-04-04 21:17:52 +02:00
2012-03-31 16:35:54 +02:00
2012-03-30 20:10:39 +02:00
2012-03-30 20:11:50 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-29 04:11:10 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-24 23:35:09 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-26 16:20:14 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-03-29 04:11:10 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-03-30 22:10:17 +02:00
2012-04-07 22:41:37 +02:00
2012-04-06 08:32:09 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-30 20:17:51 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-29 04:11:10 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-08 20:55:11 +02:00
2012-04-07 22:41:37 +02:00
2012-03-30 20:17:58 +02:00
2012-04-04 21:17:52 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-24 14:54:12 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-08 20:26:25 +02:00
2012-04-07 22:41:37 +02:00
2012-04-08 02:43:56 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-04 21:17:52 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 11:00:00 +02:00
2012-04-07 11:21:48 +02:00
2012-03-26 00:09:50 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 19:58:59 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-03-29 04:11:10 +02:00
2012-04-06 22:37:38 +03:00
2012-03-29 04:11:10 +02:00
2012-04-06 00:53:09 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-09 17:21:34 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-10 22:53:25 +02:00
2012-04-10 22:53:25 +02:00
2012-04-10 10:06:48 -07:00
2012-04-07 22:41:37 +02:00
2012-04-10 22:53:25 +02:00
2012-04-06 11:03:15 +02:00
2012-03-24 10:59:43 +01:00
2012-04-04 14:54:11 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-24 17:48:03 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-24 11:27:20 -04:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-09 23:02:33 +02:00
2012-03-25 23:10:30 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-03-23 03:09:07 +01:00
2012-03-23 03:09:07 +01:00
2012-04-08 20:55:11 +02:00
2012-04-10 22:53:25 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 19:59:00 +02:00
2012-03-25 12:24:15 +02:00
2012-03-27 11:59:39 +02:00
2012-03-26 17:48:13 -07:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-10 22:53:25 +02:00
2012-04-10 22:53:25 +02:00
2012-04-10 22:53:25 +02:00
2012-04-10 22:53:25 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-24 05:21:39 +01:00
2012-04-07 22:41:37 +02:00
2012-04-04 13:04:38 -04:00
2012-04-04 14:54:13 +02:00
2012-04-04 14:54:13 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 19:59:00 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-27 20:08:41 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-04-10 22:53:25 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-04-07 22:41:37 +02:00
2012-03-23 03:09:07 +01:00
2012-03-23 21:20:06 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
e387c9d5dd