Michael Niedermayer
6cb2085278
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
ppc: Add ff_ prefix to nonstatic symbols
sh4: Add ff_ prefix to nonstatic symbols
mpegvideo: Add ff_ prefix to nonstatic functions
rtjpeg: Add ff_ prefix to nonstatic symbols
rv: Add ff_ prefix to nonstatic symbols
vp56: Add ff_ prefix to nonstatic symbols
vorbis: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefix to nonstatic symbols
vc1: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefixes to nonstatic symbols
snow: Add ff_ prefix to nonstatic symbols
mpeg12: Add ff_ prefix to nonstatic symbols
mpeg4: Add ff_ prefixes to nonstatic symbols
lagarith: Add ff_ prefix to lag_rac_init
libavcodec: Add ff_ prefix to j_rev_dct*
dsputil: Add ff_ prefix to inv_zigzag_direct16
libavcodec: Prefix fdct_ifast, fdct_ifast248
dsputil: Add ff_ prefix to the dsputil*_init* functions
libavcodec: Add ff_ prefix to some nonstatic symbols
vlc/rl: Add ff_ prefix to the nonstatic symbols
...
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/nuv.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/proresdsp.c
libavcodec/svq3.c
libavcodec/version.h
libavformat/dv.h
libavformat/dvenc.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-16 01:34:37 +01:00
..
2011-06-24 03:07:04 +02:00
2011-06-23 07:31:54 +01:00
2012-02-02 18:50:42 +00:00
2011-10-22 11:11:08 +02:00
2011-07-06 00:29:59 +01:00
2011-10-24 01:01:21 +02:00
2012-01-14 02:22:09 +01:00
2011-12-15 01:02:58 +00:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-06-30 04:32:24 +02:00
2011-11-24 03:32:24 +01:00
2012-02-16 01:34:37 +01:00
2011-07-21 16:28:53 +02:00
2011-07-22 12:08:52 +02:00
2011-12-02 00:51:11 +01:00
2011-05-27 23:48:22 +02:00
2011-03-19 13:33:20 +00:00
2011-07-22 12:08:52 +02:00
2011-12-02 00:51:11 +01:00
2011-06-24 03:07:04 +02:00
2011-04-04 02:15:12 +02:00
2011-07-06 01:34:08 +02:00
2012-01-21 01:33:31 +01:00
2011-11-24 03:32:24 +01:00
2011-03-19 13:33:20 +00:00
2011-11-24 03:32:24 +01:00
2011-06-24 03:07:04 +02:00
2011-12-06 13:48:25 +00:00
2011-10-22 01:16:41 +02:00
2011-12-07 02:04:00 +01:00
2011-11-24 03:32:24 +01:00
2011-10-21 01:00:41 -07:00
2011-07-11 04:23:25 +02:00
2011-11-24 03:32:24 +01:00
2011-06-13 12:30:22 +01:00
2012-01-29 00:34:59 +01:00
2011-06-24 03:07:04 +02:00
2011-04-03 22:39:52 +01:00
2011-11-24 03:32:24 +01:00
2011-06-23 07:31:54 +01:00
2011-06-13 11:33:44 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-06-24 03:07:04 +02:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-06-24 03:07:04 +02:00
2011-12-02 19:59:18 +00:00
2011-06-24 03:07:04 +02:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2011-12-16 14:36:01 +00:00
2011-12-16 14:36:01 +00:00
2012-01-28 14:56:18 +00:00
2012-01-28 14:56:18 +00:00
2012-01-14 02:22:09 +01:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2012-02-07 01:40:29 +01:00
2012-02-10 01:20:07 +01:00
2011-10-03 01:49:36 +02:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00