move common stuff from avienc.c and wav.c to new file riff.c

Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 28 insertions, 27 deletions

diff --git a/libavformat/Makefile b/libavformat/Makefile
index ef9cdd4405..e512e24a44 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -16,17 +16,17 @@ HEADERS = avformat.h avio.h rtp.h rtsp.h rtspcodes.h
 # muxers/demuxers
 OBJS-$(CONFIG_FOURXM_DEMUXER)            += 4xm.o
 OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o
-OBJS-$(CONFIG_AIFF_DEMUXER)              += aiff.o
-OBJS-$(CONFIG_AIFF_MUXER)                += aiff.o
+OBJS-$(CONFIG_AIFF_DEMUXER)              += aiff.o riff.o
+OBJS-$(CONFIG_AIFF_MUXER)                += aiff.o riff.o
 OBJS-$(CONFIG_AMR_DEMUXER)               += amr.o
 OBJS-$(CONFIG_AMR_MUXER)                 += amr.o
-OBJS-$(CONFIG_ASF_DEMUXER)               += asf.o
-OBJS-$(CONFIG_ASF_MUXER)                 += asf-enc.o
-OBJS-$(CONFIG_ASF_STREAM_MUXER)          += asf-enc.o
-OBJS-$(CONFIG_AU_DEMUXER)                += au.o
-OBJS-$(CONFIG_AU_MUXER)                  += au.o
-OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o
-OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o
+OBJS-$(CONFIG_ASF_DEMUXER)               += asf.o riff.o
+OBJS-$(CONFIG_ASF_MUXER)                 += asf-enc.o riff.o
+OBJS-$(CONFIG_ASF_STREAM_MUXER)          += asf-enc.o riff.o
+OBJS-$(CONFIG_AU_DEMUXER)                += au.o riff.o
+OBJS-$(CONFIG_AU_MUXER)                  += au.o riff.o
+OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o riff.o
+OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o riff.o
 OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crc.o
 OBJS-$(CONFIG_FRAMECRC_MUXER)            += crc.o
@@ -53,16 +53,16 @@ OBJS-$(CONFIG_IMAGEPIPE_DEMUXER)         += img.o
 OBJS-$(CONFIG_IMAGE_MUXER)               += img.o
 OBJS-$(CONFIG_IMAGEPIPE_MUXER)           += img.o
 OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
-OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroska.o
+OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroska.o riff.o
 OBJS-$(CONFIG_MM_DEMUXER)                += mm.o
-OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o
-OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o
-OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o
-OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o
-OBJS-$(CONFIG_TGP_MUXER)                 += movenc.o
-OBJS-$(CONFIG_MP4_MUXER)                 += movenc.o
-OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o
-OBJS-$(CONFIG_TG2_MUXER)                 += movenc.o
+OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o riff.o
+OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o riff.o
+OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o riff.o
+OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o riff.o
+OBJS-$(CONFIG_TGP_MUXER)                 += movenc.o riff.o
+OBJS-$(CONFIG_MP4_MUXER)                 += movenc.o riff.o
+OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o riff.o
+OBJS-$(CONFIG_TG2_MUXER)                 += movenc.o riff.o
 OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.o
 OBJS-$(CONFIG_MP2_MUXER)                 += mp3.o
 OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o
@@ -75,15 +75,16 @@ OBJS-$(CONFIG_MPEGPS_DEMUXER)            += mpeg.o
 OBJS-$(CONFIG_MPEGTS_DEMUXER)            += mpegts.o
 OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.o
 OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
-OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.o
-OBJS-$(CONFIG_NUT_DEMUXER)               += nut.o
-OBJS-$(CONFIG_NUT_MUXER)                 += nut.o
-OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o
+OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.o riff.o
+OBJS-$(CONFIG_NUT_DEMUXER)               += nut.o riff.o
+OBJS-$(CONFIG_NUT_MUXER)                 += nut.o riff.o
+OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
 OBJS-$(CONFIG_OGG_DEMUXER)               += ogg2.o           \
                                             oggparsevorbis.o \
                                             oggparsetheora.o \
                                             oggparseflac.o   \
-                                            oggparseogm.o
+                                            oggparseogm.o    \
+                                            riff.o
 OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o
 OBJS-$(CONFIG_FLAC_DEMUXER)              += raw.o
@@ -118,10 +119,10 @@ OBJS-$(CONFIG_SOL_DEMUXER)               += sol.o
 OBJS-$(CONFIG_SWF_DEMUXER)               += swf.o
 OBJS-$(CONFIG_SWF_MUXER)                 += swf.o
 OBJS-$(CONFIG_TTA_DEMUXER)               += tta.o
-OBJS-$(CONFIG_VOC_DEMUXER)               += voc.o
-OBJS-$(CONFIG_VOC_MUXER)                 += voc.o
-OBJS-$(CONFIG_WAV_DEMUXER)               += wav.o
-OBJS-$(CONFIG_WAV_MUXER)                 += wav.o
+OBJS-$(CONFIG_VOC_DEMUXER)               += voc.o riff.o
+OBJS-$(CONFIG_VOC_MUXER)                 += voc.o riff.o
+OBJS-$(CONFIG_WAV_DEMUXER)               += wav.o riff.o
+OBJS-$(CONFIG_WAV_MUXER)                 += wav.o riff.o
 OBJS-$(CONFIG_WC3_DEMUXER)               += wc3movie.o
 OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o
 OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.o