Michael Niedermayer
ee77140afa
Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2':
cosmetics: Group .name and .long_name together in codec/format declarations
Conflicts:
libavcodec/8svx.c
libavcodec/alac.c
libavcodec/cljr.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dpxenc.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/ffv1dec.c
libavcodec/flacdec.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g726.c
libavcodec/gif.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopencore-amr.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/libvo-amrwbenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/ljpegenc.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/msmpeg4dec.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/proresdec_lgpl.c
libavcodec/proresenc_kostya.c
libavcodec/ra144enc.c
libavcodec/rawdec.c
libavcodec/rv10.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tta.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/wavpack.c
libavcodec/xbmenc.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 12:34:23 +02:00
..
2013-09-28 20:25:29 -04:00
2013-09-23 15:23:53 +02:00
2013-10-02 21:03:15 -04:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-28 12:09:41 +02:00
2013-10-02 17:20:29 +00:00
2013-09-19 12:55:26 +02:00
2013-09-12 17:22:36 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-12 17:25:30 +02:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-09-19 12:55:26 +02:00
2013-09-19 12:55:26 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-08-12 19:40:29 +02:00
2013-08-30 15:47:38 +00:00
2013-08-12 19:40:29 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-02 21:03:11 -04:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-08 18:50:25 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-03 15:05:18 +02:00
2013-09-03 15:05:18 +02:00
2013-10-03 21:46:42 +02:00
2013-09-03 15:05:18 +02:00
2013-10-03 23:00:09 +02:00
2013-10-03 21:46:42 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-03 16:33:09 +02:00
2013-09-04 16:37:25 +02:00
2013-09-16 14:22:26 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-13 15:45:08 +02:00
2013-08-13 15:45:08 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-08-12 19:40:29 +02:00
2013-08-30 15:47:38 +00:00
2013-08-08 15:05:48 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-25 16:30:25 +02:00
2013-09-28 20:28:08 -04:00
2013-09-28 11:28:09 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-02 17:20:29 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-27 01:33:45 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-18 10:39:34 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-08-16 16:07:29 +02:00
2013-08-16 16:07:29 +02:00
2013-09-28 20:28:08 -04:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-06 01:19:37 +02:00
2013-08-29 14:32:05 +02:00
2013-10-02 17:20:29 +00:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-01 03:50:08 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-29 12:19:47 +02:00
2013-08-13 15:45:08 +02:00
2013-08-26 20:39:22 +02:00
2013-09-17 11:33:38 +03:00
2013-09-09 20:19:28 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-10 00:53:33 +03:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-25 17:42:01 +03:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-30 14:34:12 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-16 13:01:44 +02:00
2013-10-04 12:34:23 +02:00
2013-08-25 12:26:14 +02:00
2013-08-20 19:59:50 +02:00
2013-08-21 11:18:43 +02:00
2013-08-20 19:59:50 +02:00
2013-10-02 17:20:29 +00:00
2013-08-20 19:59:50 +02:00
2013-08-08 12:47:05 +02:00
2013-08-21 13:03:40 +02:00
2013-08-21 11:18:43 +02:00
2013-10-03 20:13:55 +02:00
2013-10-04 12:34:23 +02:00
2013-09-28 11:28:09 +02:00
2013-08-21 12:21:48 +02:00
2013-08-08 12:47:05 +02:00
2013-08-08 12:47:05 +02:00
2013-09-28 20:33:56 +02:00
2013-09-28 20:33:56 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-02 19:59:10 +02:00
2013-10-02 17:20:29 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-09 20:18:54 +02:00
2013-10-04 12:34:23 +02:00
2013-08-16 13:01:44 +02:00
2013-08-24 23:06:59 +02:00
2013-09-17 16:22:47 +02:00
2013-08-30 15:47:38 +00:00
2013-08-23 18:06:54 +02:00
2013-10-03 19:03:56 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-17 12:12:21 -04:00
2013-10-04 12:34:23 +02:00
2013-08-24 11:23:25 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-04 16:36:20 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-07 21:13:12 +02:00
2013-10-04 12:34:23 +02:00
2013-09-02 01:19:52 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-12 19:40:29 +02:00
2013-08-14 23:15:54 +02:00
2013-10-04 12:34:23 +02:00
2013-10-02 21:03:11 -04:00
2013-09-19 11:47:40 +02:00
2013-10-04 12:34:23 +02:00
2013-08-08 12:11:33 +02:00
2013-08-08 12:11:33 +02:00
2013-08-26 14:47:15 +02:00
2013-10-04 12:34:23 +02:00
2013-10-02 17:20:29 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-13 00:30:34 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-02 17:20:29 +00:00
2013-10-02 17:20:29 +00:00
2013-10-02 17:20:29 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-09 03:14:53 +02:00
2013-08-16 13:01:44 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-17 22:17:49 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-28 20:28:08 -04:00
2013-09-28 20:28:08 -04:00
2013-09-28 11:28:09 +02:00
2013-08-16 13:01:44 +02:00
2013-10-04 12:34:23 +02:00
2013-09-21 16:59:13 +02:00
2013-10-04 12:34:23 +02:00
2013-08-26 19:26:01 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-02 17:20:29 +00:00
2013-10-04 12:34:23 +02:00
2013-09-22 16:20:54 +02:00
2013-08-13 15:24:30 +02:00
2013-10-04 12:34:23 +02:00
2013-09-26 21:03:48 +02:00
2013-10-04 12:34:23 +02:00
2013-09-13 13:48:43 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 23:22:18 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-09-22 16:20:54 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-09-08 23:11:39 +02:00
2013-08-09 23:02:48 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-02 17:20:29 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-14 11:56:12 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-09-28 20:28:08 -04:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-08-29 16:15:54 +02:00
2013-09-11 12:51:01 +02:00
2013-10-04 12:34:23 +02:00
2013-08-11 19:30:51 +02:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-22 17:30:51 +00:00
2013-10-04 12:34:23 +02:00
2013-09-15 03:21:03 +02:00
2013-09-06 01:19:37 +02:00
2013-09-06 01:19:37 +02:00
2013-09-21 16:59:13 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-28 20:28:08 -04:00
2013-09-28 11:28:09 +02:00
2013-08-29 22:52:04 +02:00
2013-09-21 16:59:13 +02:00
2013-10-04 12:34:23 +02:00
2013-09-08 18:50:25 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-03 18:47:50 +02:00
2013-09-29 12:19:47 +02:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-08-13 19:29:10 +00:00
2013-08-13 00:30:02 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-26 14:47:15 +02:00
2013-08-06 16:37:08 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-03 16:33:09 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-22 16:08:35 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-29 16:15:54 +02:00
2013-10-04 12:34:23 +02:00
2013-08-11 20:16:57 +02:00
2013-08-31 13:32:13 +02:00
2013-08-06 14:25:26 +02:00
2013-08-06 14:25:26 +02:00
2013-10-02 20:51:14 +02:00
2013-08-17 22:17:49 +02:00
2013-08-11 20:16:57 +02:00
2013-10-03 16:33:09 +02:00
2013-09-28 20:28:08 -04:00
2013-10-03 21:29:38 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-30 15:47:38 +00:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-08-29 16:15:54 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-16 13:19:24 +02:00
2013-10-04 12:34:23 +02:00
2013-09-28 20:28:08 -04:00
2013-09-23 15:23:53 +02:00
2013-10-02 21:03:11 -04:00
2013-10-02 21:03:11 -04:00
2013-10-02 21:03:11 -04:00
2013-10-02 21:03:15 -04:00
2013-10-02 21:03:15 -04:00
2013-09-28 20:28:08 -04:00
2013-08-16 13:19:24 +02:00
2013-08-16 13:37:10 +02:00
2013-08-16 13:37:10 +02:00
2013-08-24 11:04:11 +02:00
2013-08-24 11:04:11 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-08-31 13:34:46 +02:00
2013-08-17 22:25:49 +00:00
2013-08-26 19:30:45 +00:00
2013-09-19 12:36:11 +02:00
2013-08-30 15:47:38 +00:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-09-28 20:28:08 -04:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00
2013-10-04 12:34:23 +02:00