git.osdn.net Git - android-x86/external-ffmpeg.git/commit

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>

author	Michael Niedermayer <michaelni@gmx.at>
	Wed, 15 Feb 2012 23:49:16 +0000 (00:49 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Thu, 16 Feb 2012 00:34:37 +0000 (01:34 +0100)
commit	6cb2085278bdd3ee83d5ed528d98c78756ee7277
tree	da57b6491e07c2deb9cf57e3cd595323d118c244	tree \| snapshot
parent	8812c97b98321f82763b7c9c1363c7c1f6cace8f	commit \| diff
parent	210f72845c11fbab7b913a4f18ffd67e99d2dd4f	commit \| diff

Changelog	diff1 \|	diff2 \|	blob \| history
libavcodec/4xm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/Makefile	diff1 \|	diff2 \|	blob \| history
libavcodec/aacdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/aacenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ac3dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ac3enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/allcodecs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/dsputil_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alpha/mpegvideo_alpha.c	diff1 \|	diff2 \|	blob \| history
libavcodec/alsdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/apedec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/dsputil_init_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/mpegvideo_arm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/mpegvideo_arm.h	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/mpegvideo_armv5te.c	diff1 \|	diff2 \|	blob \| history
libavcodec/arm/mpegvideo_iwmmxt.c	diff1 \|	diff2 \|	blob \| history
libavcodec/asv1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/atrac.c	diff1 \|	diff2 \|	blob \| history
libavcodec/atrac.h	diff1 \|	diff2 \|	blob \| history
libavcodec/atrac1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/atrac3.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/dsputil_bfin.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bfin/mpegvideo_bfin.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bink.c	diff1 \|	diff2 \|	blob \| history
libavcodec/binkaudio.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bitstream.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cook.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dca.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dct-test.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhddec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhdenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dsputil.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dsputil.h	diff1 \|	diff2 \|	blob \| history
libavcodec/dv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eamad.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eatgq.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eatqi.c	diff1 \|	diff2 \|	blob \| history
libavcodec/error_resilience.c	diff1 \|	diff2 \|	blob \| history
libavcodec/faxcompr.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ffv1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/flvenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/fraps.c	diff1 \|	diff2 \|	blob \| history
libavcodec/get_bits.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h261dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h261enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h263.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h263.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h263data.h	diff1 \|	diff2 \|	blob \| history
libavcodec/h263dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/huffman.c	diff1 \|	diff2 \|	blob \| history
libavcodec/huffyuv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/imc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/indeo3.c	diff1 \|	diff2 \|	blob \| history
libavcodec/indeo5.c	diff1 \|	diff2 \|	blob \| history
libavcodec/intelh263dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/interplayvideo.c	diff1 \|	diff2 \|	blob \| history
libavcodec/intrax8.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ituh263dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ituh263enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ivi_common.c	diff1 \|	diff2 \|	blob \| history
libavcodec/jvdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/lagarith.c	diff1 \|	diff2 \|	blob \| history
libavcodec/lagarithrac.c	diff1 \|	diff2 \|	blob \| history
libavcodec/lagarithrac.h	diff1 \|	diff2 \|	blob \| history
libavcodec/ljpegenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mimic.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mips/dsputil_mmi.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mips/mpegvideo_mmi.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mlpdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/motion-test.c	diff1 \|	diff2 \|	blob \| history
libavcodec/motionpixels.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpc7.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpc8.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4data.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4video.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4videodec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4videoenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo_common.h	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo_enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/msmpeg4.c	diff1 \|	diff2 \|	blob \| history
libavcodec/msmpeg4data.c	diff1 \|	diff2 \|	blob \| history
libavcodec/msmpeg4data.h	diff1 \|	diff2 \|	blob \| history
libavcodec/nellymoserdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/nellymoserenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/nuv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/pngenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/dsputil_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/dsputil_altivec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/dsputil_ppc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/fdct_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/float_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/gmc_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/h264_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/idct_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/int_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/mpegvideo_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/vp8dsp_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdec_lgpl.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdsp.h	diff1 \|	diff2 \|	blob \| history
libavcodec/proresenc_kostya.c	\|	diff2 \|	blob \| history
libavcodec/ra288.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rl.h	diff1 \|	diff2 \|	blob \| history
libavcodec/rtjpeg.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rtjpeg.h	diff1 \|	diff2 \|	blob \| history
libavcodec/rv10.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rv10enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rv20enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rv34.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rv34data.h	diff1 \|	diff2 \|	blob \| history
libavcodec/rv40.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/dsputil_align.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/dsputil_sh4.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/dsputil_sh4.h	diff1 \|	diff2 \|	blob \| history
libavcodec/sh4/idct_sh4.c	diff1 \|	diff2 \|	blob \| history
libavcodec/smacker.c	diff1 \|	diff2 \|	blob \| history
libavcodec/snow.c	diff1 \|	diff2 \|	blob \| history
libavcodec/snow.h	diff1 \|	diff2 \|	blob \| history
libavcodec/snowdata.h	diff1 \|	diff2 \|	blob \| history
libavcodec/snowdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/snowenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sparc/dsputil_vis.c	diff1 \|	diff2 \|	blob \| history
libavcodec/svq1dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/svq1enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/svq3.c	diff1 \|	diff2 \|	blob \| history
libavcodec/truemotion2.c	diff1 \|	diff2 \|	blob \| history
libavcodec/truespeech.c	diff1 \|	diff2 \|	blob \| history
libavcodec/twinvq.c	diff1 \|	diff2 \|	blob \| history
libavcodec/utils.c	diff1 \|	diff2 \|	blob \| history
libavcodec/utvideo.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vble.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1_parser.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1data.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1data.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/version.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vorbis.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vorbisdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp3.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp5.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp56.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp56data.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp56data.h	diff1 \|	diff2 \|	blob \| history
libavcodec/vp6.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wma.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmaprodec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2.c	diff1 \|	diff2 \|	blob \| history
libavcodec/wmv2enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputil_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputil_mmx.h	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputilenc_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/motion_est_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/mpegvideo_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/mpegvideo_mmx_template.c	diff1 \|	diff2 \|	blob \| history
libavformat/aea.c	diff1 \|	diff2 \|	blob \| history
libavformat/aiffdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/au.c	diff1 \|	diff2 \|	blob \| history
libavformat/avidec.c	diff1 \|	diff2 \|	blob \| history
libavformat/avs.c	diff1 \|	diff2 \|	blob \| history
libavformat/c93.c	diff1 \|	diff2 \|	blob \| history
libavformat/cutils.c	diff1 \|	diff2 \|	blob \| history
libavformat/dv.c	diff1 \|	diff2 \|	blob \| history
libavformat/dv.h	diff1 \|	diff2 \|	blob \| history
libavformat/dvenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/internal.h	diff1 \|	diff2 \|	blob \| history
libavformat/isom.c	diff1 \|	diff2 \|	blob \| history
libavformat/isom.h	diff1 \|	diff2 \|	blob \| history
libavformat/matroskadec.c	diff1 \|	diff2 \|	blob \| history
libavformat/matroskaenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mmf.c	diff1 \|	diff2 \|	blob \| history
libavformat/mov.c	diff1 \|	diff2 \|	blob \| history
libavformat/movenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/omadec.c	diff1 \|	diff2 \|	blob \| history
libavformat/pcm.c	diff1 \|	diff2 \|	blob \| history
libavformat/pcm.h	diff1 \|	diff2 \|	blob \| history
libavformat/pcmdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rsodec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtspdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/sol.c	diff1 \|	diff2 \|	blob \| history
libavformat/soxdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/voc.h	diff1 \|	diff2 \|	blob \| history
libavformat/vocdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/wav.c	diff1 \|	diff2 \|	blob \| history