Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 18:39:01 +0000 (20:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 18:39:08 +0000 (20:39 +0200)
* commit '23944d29a22a2cd602753b3705f73011c3bf0b18':
  indeo: Give Indeo4/5 shared code a more consistent name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile
libavcodec/indeo4.c
libavcodec/indeo4data.h
libavcodec/indeo5.c
libavcodec/ivi.c
libavcodec/ivi.h
libavcodec/ivi_dsp.c
libavcodec/ivi_dsp.h

@@@ -287,13 -240,10 +287,13 @@@ OBJS-$(CONFIG_IFF_ILBM_DECODER)        
  OBJS-$(CONFIG_IMC_DECODER)             += imc.o
  OBJS-$(CONFIG_INDEO2_DECODER)          += indeo2.o
  OBJS-$(CONFIG_INDEO3_DECODER)          += indeo3.o
- OBJS-$(CONFIG_INDEO4_DECODER)          += indeo4.o ivi_common.o ivi_dsp.o
- OBJS-$(CONFIG_INDEO5_DECODER)          += indeo5.o ivi_common.o ivi_dsp.o
+ OBJS-$(CONFIG_INDEO4_DECODER)          += indeo4.o ivi.o ivi_dsp.o
+ OBJS-$(CONFIG_INDEO5_DECODER)          += indeo5.o ivi.o ivi_dsp.o
  OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER)  += dpcm.o
  OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
 +OBJS-$(CONFIG_JACOSUB_DECODER)         += jacosubdec.o ass.o
 +OBJS-$(CONFIG_JPEG2000_ENCODER)        += j2kenc.o mqcenc.o mqc.o jpeg2000.o \
 +                                          jpeg2000dwt.o
  OBJS-$(CONFIG_JPEG2000_DECODER)        += jpeg2000dec.o jpeg2000.o jpeg2000dsp.o \
                                            jpeg2000dwt.o mqcdec.o mqc.o
  OBJS-$(CONFIG_JPEGLS_DECODER)          += jpeglsdec.o jpegls.o
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge