diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-31 03:16:35 +0400 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-31 03:16:35 +0400 |
commit | 4ca31edcfe1ac6b8d48353436fefd1549161cd83 (patch) | |
tree | 496d768e31248092a4a8ec8fc9a6fabc34716dfd /libavformat | |
parent | 92aa28d29295bf417c5a41687c2b31044dcfab36 (diff) |
split raw.c into rawdec.c and rawenc.c
Originally committed as revision 24997 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/Makefile | 156 | ||||
-rw-r--r-- | libavformat/aacdec.c | 2 | ||||
-rw-r--r-- | libavformat/ac3dec.c | 2 | ||||
-rw-r--r-- | libavformat/cavsvideodec.c | 2 | ||||
-rw-r--r-- | libavformat/diracdec.c | 2 | ||||
-rw-r--r-- | libavformat/dnxhddec.c | 2 | ||||
-rw-r--r-- | libavformat/dtsdec.c | 2 | ||||
-rw-r--r-- | libavformat/flacdec.c | 2 | ||||
-rw-r--r-- | libavformat/h261dec.c | 2 | ||||
-rw-r--r-- | libavformat/h263dec.c | 2 | ||||
-rw-r--r-- | libavformat/h264dec.c | 2 | ||||
-rw-r--r-- | libavformat/idroqenc.c | 2 | ||||
-rw-r--r-- | libavformat/ingenientdec.c | 2 | ||||
-rw-r--r-- | libavformat/m4vdec.c | 2 | ||||
-rw-r--r-- | libavformat/mpegvideodec.c | 2 | ||||
-rw-r--r-- | libavformat/pcmdec.c | 2 | ||||
-rw-r--r-- | libavformat/pcmenc.c | 2 | ||||
-rw-r--r-- | libavformat/rawdec.c (renamed from libavformat/raw.c) | 269 | ||||
-rw-r--r-- | libavformat/rawdec.h (renamed from libavformat/raw.h) | 10 | ||||
-rw-r--r-- | libavformat/rawenc.c | 285 | ||||
-rw-r--r-- | libavformat/rawenc.h | 29 | ||||
-rw-r--r-- | libavformat/rawvideodec.c | 2 |
22 files changed, 415 insertions, 368 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index f2d7378b72..7955b80893 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -17,9 +17,9 @@ OBJS = allformats.o \ # muxers/demuxers OBJS-$(CONFIG_A64_MUXER) += a64.o -OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o id3v1.o id3v2.o raw.o -OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o raw.o -OBJS-$(CONFIG_AC3_MUXER) += raw.o +OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o id3v1.o id3v2.o rawdec.o +OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o +OBJS-$(CONFIG_AC3_MUXER) += rawenc.o OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o riff.o pcm.o @@ -47,30 +47,30 @@ OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o OBJS-$(CONFIG_BINK_DEMUXER) += bink.o OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o riff.o isom.o -OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o raw.o +OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o OBJS-$(CONFIG_DAUD_MUXER) += daud.o -OBJS-$(CONFIG_DIRAC_DEMUXER) += diracdec.o raw.o -OBJS-$(CONFIG_DIRAC_MUXER) += raw.o -OBJS-$(CONFIG_DNXHD_DEMUXER) += dnxhddec.o raw.o -OBJS-$(CONFIG_DNXHD_MUXER) += raw.o +OBJS-$(CONFIG_DIRAC_DEMUXER) += diracdec.o rawdec.o +OBJS-$(CONFIG_DIRAC_MUXER) += rawenc.o +OBJS-$(CONFIG_DNXHD_DEMUXER) += dnxhddec.o rawdec.o +OBJS-$(CONFIG_DNXHD_MUXER) += rawenc.o OBJS-$(CONFIG_DSICIN_DEMUXER) += dsicin.o -OBJS-$(CONFIG_DTS_DEMUXER) += dtsdec.o raw.o -OBJS-$(CONFIG_DTS_MUXER) += raw.o +OBJS-$(CONFIG_DTS_DEMUXER) += dtsdec.o rawdec.o +OBJS-$(CONFIG_DTS_MUXER) += rawenc.o OBJS-$(CONFIG_DV_DEMUXER) += dv.o OBJS-$(CONFIG_DV_MUXER) += dvenc.o OBJS-$(CONFIG_DXA_DEMUXER) += dxa.o riff.o OBJS-$(CONFIG_EA_CDATA_DEMUXER) += eacdata.o OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o -OBJS-$(CONFIG_EAC3_DEMUXER) += ac3dec.o raw.o -OBJS-$(CONFIG_EAC3_MUXER) += raw.o +OBJS-$(CONFIG_EAC3_DEMUXER) += ac3dec.o rawdec.o +OBJS-$(CONFIG_EAC3_MUXER) += rawenc.o OBJS-$(CONFIG_FFM_DEMUXER) += ffmdec.o OBJS-$(CONFIG_FFM_MUXER) += ffmenc.o OBJS-$(CONFIG_FILMSTRIP_DEMUXER) += filmstripdec.o OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o -OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o raw.o id3v1.o \ +OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o rawdec.o id3v1.o \ id3v2.o oggparsevorbis.o \ vorbiscomment.o OBJS-$(CONFIG_FLAC_MUXER) += flacenc.o flacenc_header.o \ @@ -82,39 +82,39 @@ OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o OBJS-$(CONFIG_FRAMEMD5_MUXER) += md5enc.o OBJS-$(CONFIG_GIF_MUXER) += gif.o -OBJS-$(CONFIG_GSM_DEMUXER) += raw.o +OBJS-$(CONFIG_GSM_DEMUXER) += rawdec.o OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o -OBJS-$(CONFIG_H261_DEMUXER) += h261dec.o raw.o -OBJS-$(CONFIG_H261_MUXER) += raw.o -OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o raw.o -OBJS-$(CONFIG_H263_MUXER) += raw.o -OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o raw.o -OBJS-$(CONFIG_H264_MUXER) += raw.o +OBJS-$(CONFIG_H261_DEMUXER) += h261dec.o rawdec.o +OBJS-$(CONFIG_H261_MUXER) += rawenc.o +OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o +OBJS-$(CONFIG_H263_MUXER) += rawenc.o +OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o +OBJS-$(CONFIG_H264_MUXER) += rawenc.o OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o OBJS-$(CONFIG_IFF_DEMUXER) += iff.o OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2.o OBJS-$(CONFIG_IMAGE2_MUXER) += img2.o OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2.o OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2.o -OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o raw.o +OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o rawdec.o OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o OBJS-$(CONFIG_ISS_DEMUXER) += iss.o OBJS-$(CONFIG_IV8_DEMUXER) += iv8.o OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o riff.o OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o -OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o raw.o -OBJS-$(CONFIG_M4V_MUXER) += raw.o +OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o rawdec.o +OBJS-$(CONFIG_M4V_MUXER) += rawenc.o OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ riff.o isom.o rmdec.o rm.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ riff.o isom.o avc.o \ flacenc_header.o OBJS-$(CONFIG_MD5_MUXER) += md5enc.o -OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o -OBJS-$(CONFIG_MJPEG_MUXER) += raw.o -OBJS-$(CONFIG_MLP_DEMUXER) += raw.o -OBJS-$(CONFIG_MLP_MUXER) += raw.o +OBJS-$(CONFIG_MJPEG_DEMUXER) += rawdec.o +OBJS-$(CONFIG_MJPEG_MUXER) += rawenc.o +OBJS-$(CONFIG_MLP_DEMUXER) += rawdec.o +OBJS-$(CONFIG_MLP_MUXER) += rawenc.o OBJS-$(CONFIG_MM_DEMUXER) += mm.o OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o pcm.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o @@ -130,12 +130,12 @@ OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpegenc.o OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpegenc.o OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpegenc.o OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpegenc.o -OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += raw.o -OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.o +OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += rawenc.o +OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += rawenc.o OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o adtsenc.o -OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += mpegvideodec.o raw.o +OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += mpegvideodec.o rawdec.o OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o @@ -161,56 +161,56 @@ OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \ vorbiscomment.o OBJS-$(CONFIG_OMA_DEMUXER) += oma.o pcm.o id3v2.o id3v1.o -OBJS-$(CONFIG_PCM_ALAW_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_ALAW_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_F32BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_F32BE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_F32LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_F32LE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_F64BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_F64BE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_F64LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_F64LE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_MULAW_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_MULAW_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_S16BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S16BE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_S16LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S16LE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_S24BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S24BE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_S24LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S24LE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_S32BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S32BE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_S32LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S32LE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_S8_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_S8_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_U16BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U16BE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_U16LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U16LE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_U24BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U24BE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_U24LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U24LE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_U32BE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U32BE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U32LE_MUXER) += pcmenc.o raw.o -OBJS-$(CONFIG_PCM_U8_DEMUXER) += pcmdec.o pcm.o raw.o -OBJS-$(CONFIG_PCM_U8_MUXER) += pcmenc.o raw.o +OBJS-$(CONFIG_PCM_ALAW_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_ALAW_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_F32BE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_F32BE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_F32LE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_F32LE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_F64BE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_F64BE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_F64LE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_F64LE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_MULAW_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_MULAW_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_S16BE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_S16BE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_S16LE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_S16LE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_S24BE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_S24BE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_S24LE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_S24LE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_S32BE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_S32BE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_S32LE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_S32LE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_S8_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_S8_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_U16BE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_U16BE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_U16LE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_U16LE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_U24BE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_U24BE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_U24LE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_U24LE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_U32BE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_U32BE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_U32LE_MUXER) += pcmenc.o rawenc.o +OBJS-$(CONFIG_PCM_U8_DEMUXER) += pcmdec.o pcm.o rawdec.o +OBJS-$(CONFIG_PCM_U8_MUXER) += pcmenc.o rawenc.o OBJS-$(CONFIG_PVA_DEMUXER) += pva.o OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o -OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += rawvideodec.o raw.o -OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o +OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += rawvideodec.o rawdec.o +OBJS-$(CONFIG_RAWVIDEO_MUXER) += rawenc.o OBJS-$(CONFIG_RL2_DEMUXER) += rl2.o OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o OBJS-$(CONFIG_RM_MUXER) += rmenc.o rm.o OBJS-$(CONFIG_ROQ_DEMUXER) += idroqdec.o -OBJS-$(CONFIG_ROQ_MUXER) += idroqenc.o raw.o +OBJS-$(CONFIG_ROQ_MUXER) += idroqenc.o rawenc.o OBJS-$(CONFIG_RSO_DEMUXER) += rsodec.o rso.o pcm.o OBJS-$(CONFIG_RSO_MUXER) += rsoenc.o rso.o OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o @@ -241,7 +241,7 @@ OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o \ rtpdec_vp8.o \ rtpdec_xiph.o OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o -OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o +OBJS-$(CONFIG_SHORTEN_DEMUXER) += rawdec.o OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o OBJS-$(CONFIG_SOL_DEMUXER) += sol.o pcm.o @@ -249,19 +249,19 @@ OBJS-$(CONFIG_SOX_DEMUXER) += soxdec.o pcm.o OBJS-$(CONFIG_SOX_MUXER) += soxenc.o OBJS-$(CONFIG_SPDIF_MUXER) += spdif.o OBJS-$(CONFIG_SRT_DEMUXER) += srtdec.o -OBJS-$(CONFIG_SRT_MUXER) += raw.o +OBJS-$(CONFIG_SRT_MUXER) += rawenc.o OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o OBJS-$(CONFIG_SWF_MUXER) += swfenc.o OBJS-$(CONFIG_THP_DEMUXER) += thp.o OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o OBJS-$(CONFIG_TMV_DEMUXER) += tmv.o -OBJS-$(CONFIG_TRUEHD_DEMUXER) += raw.o -OBJS-$(CONFIG_TRUEHD_MUXER) += raw.o +OBJS-$(CONFIG_TRUEHD_DEMUXER) += rawdec.o +OBJS-$(CONFIG_TRUEHD_MUXER) += rawenc.o OBJS-$(CONFIG_TTA_DEMUXER) += tta.o id3v1.o id3v2.o OBJS-$(CONFIG_TTY_DEMUXER) += tty.o sauce.o OBJS-$(CONFIG_TXD_DEMUXER) += txd.o -OBJS-$(CONFIG_VC1_DEMUXER) += raw.o +OBJS-$(CONFIG_VC1_DEMUXER) += rawdec.o OBJS-$(CONFIG_VC1T_DEMUXER) += vc1test.o OBJS-$(CONFIG_VC1T_MUXER) += vc1testenc.o OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 8737e56409..bcceff3775 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -22,7 +22,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" -#include "raw.h" +#include "rawdec.h" #include "id3v2.h" #include "id3v1.h" diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index b260354514..b8a2bdd4a0 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -22,7 +22,7 @@ #include "libavutil/crc.h" #include "libavcodec/ac3_parser.h" #include "avformat.h" -#include "raw.h" +#include "rawdec.h" static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) { diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c index 937d4b671b..51a75010d7 100644 --- a/libavformat/cavsvideodec.c +++ b/libavformat/cavsvideodec.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawdec.h" #define CAVS_SEQ_START_CODE 0x000001b0 #define CAVS_PIC_I_START_CODE 0x000001b3 diff --git a/libavformat/diracdec.c b/libavformat/diracdec.c index 5293988c80..aa887e736a 100644 --- a/libavformat/diracdec.c +++ b/libavformat/diracdec.c @@ -21,7 +21,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" -#include "raw.h" +#include "rawdec.h" static int dirac_probe(AVProbeData *p) { diff --git a/libavformat/dnxhddec.c b/libavformat/dnxhddec.c index 26e39699c6..edd44fee76 100644 --- a/libavformat/dnxhddec.c +++ b/libavformat/dnxhddec.c @@ -22,7 +22,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" -#include "raw.h" +#include "rawdec.h" static int dnxhd_probe(AVProbeData *p) { diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c index 67e3d0f34f..c132c086b1 100644 --- a/libavformat/dtsdec.c +++ b/libavformat/dtsdec.c @@ -21,7 +21,7 @@ #include "libavcodec/bytestream.h" #include "avformat.h" -#include "raw.h" +#include "rawdec.h" #define DCA_MARKER_14B_BE 0x1FFFE800 #define DCA_MARKER_14B_LE 0xFF1F00E8 diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 3cdd53c6af..e54fb395ff 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -21,7 +21,7 @@ #include "libavcodec/flac.h" #include "avformat.h" -#include "raw.h" +#include "rawdec.h" #include "id3v2.h" #include "oggdec.h" #include "vorbiscomment.h" diff --git a/libavformat/h261dec.c b/libavformat/h261dec.c index 936415c7e0..13394a1c86 100644 --- a/libavformat/h261dec.c +++ b/libavformat/h261dec.c @@ -21,7 +21,7 @@ #include "libavcodec/get_bits.h" #include "avformat.h" -#include "raw.h" +#include "rawdec.h" static int h261_probe(AVProbeData *p) { diff --git a/libavformat/h263dec.c b/libavformat/h263dec.c index 4aec94eb25..e27c395dd2 100644 --- a/libavformat/h263dec.c +++ b/libavformat/h263dec.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawdec.h" static int h263_probe(AVProbeData *p) { diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c index 96ffb088a4..10c239d439 100644 --- a/libavformat/h264dec.c +++ b/libavformat/h264dec.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawdec.h" static int h264_probe(AVProbeData *p) { diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c index a0f87395e9..fda899a18f 100644 --- a/libavformat/idroqenc.c +++ b/libavformat/idroqenc.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawenc.h" static int roq_write_header(struct AVFormatContext *s) diff --git a/libavformat/ingenientdec.c b/libavformat/ingenientdec.c index 48f82ed333..61d39e1d10 100644 --- a/libavformat/ingenientdec.c +++ b/libavformat/ingenientdec.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawdec.h" // http://www.artificis.hu/files/texts/ingenient.txt static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt) diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c index 84363a1873..fdd3a808c6 100644 --- a/libavformat/m4vdec.c +++ b/libavformat/m4vdec.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawdec.h" #define VISUAL_OBJECT_START_CODE 0x000001b5 #define VOP_START_CODE 0x000001b6 diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c index 4700727680..d0b9a2c658 100644 --- a/libavformat/mpegvideodec.c +++ b/libavformat/mpegvideodec.c @@ -21,7 +21,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawdec.h" #define SEQ_START_CODE 0x000001b3 #define GOP_START_CODE 0x000001b8 diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index b657fb680b..26be4f4b1e 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawdec.h" #include "pcm.h" #define RAW_SAMPLES 1024 diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c index 791bdf2372..bda94c37b1 100644 --- a/libavformat/pcmenc.c +++ b/libavformat/pcmenc.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawenc.h" #define PCMDEF(name, long_name, ext, codec) \ AVOutputFormat pcm_ ## name ## _muxer = {\ diff --git a/libavformat/raw.c b/libavformat/rawdec.c index 59bcc64f73..e093969414 100644 --- a/libavformat/raw.c +++ b/libavformat/rawdec.c @@ -1,5 +1,5 @@ /* - * RAW muxer and demuxer + * RAW demuxers * Copyright (c) 2001 Fabrice Bellard * Copyright (c) 2005 Alex Beregszaszi * @@ -21,20 +21,8 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawdec.h" -/* simple formats */ - -#if CONFIG_MUXERS -int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt) -{ - put_buffer(s->pb, pkt->data, pkt->size); - put_flush_packet(s->pb); - return 0; -} -#endif - -#if CONFIG_DEMUXERS /* raw input */ int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap) { @@ -146,85 +134,9 @@ int ff_raw_video_read_header(AVFormatContext *s, return 0; } -#endif /* Note: Do not forget to add new entries to the Makefile as well. */ -#if CONFIG_AC3_MUXER -AVOutputFormat ac3_muxer = { - "ac3", - NULL_IF_CONFIG_SMALL("raw AC-3"), - "audio/x-ac3", - "ac3", - 0, - CODEC_ID_AC3, - CODEC_ID_NONE, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_DIRAC_MUXER -AVOutputFormat dirac_muxer = { - "dirac", - NULL_IF_CONFIG_SMALL("raw Dirac"), - NULL, - "drc", - 0, - CODEC_ID_NONE, - CODEC_ID_DIRAC, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_DNXHD_MUXER -AVOutputFormat dnxhd_muxer = { - "dnxhd", - NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), - NULL, - "dnxhd", - 0, - CODEC_ID_NONE, - CODEC_ID_DNXHD, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_DTS_MUXER -AVOutputFormat dts_muxer = { - "dts", - NULL_IF_CONFIG_SMALL("raw DTS"), - "audio/x-dca", - "dts", - 0, - CODEC_ID_DTS, - CODEC_ID_NONE, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_EAC3_MUXER -AVOutputFormat eac3_muxer = { - "eac3", - NULL_IF_CONFIG_SMALL("raw E-AC-3"), - "audio/x-eac3", - "eac3", - 0, - CODEC_ID_EAC3, - CODEC_ID_NONE, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - #if CONFIG_GSM_DEMUXER AVInputFormat gsm_demuxer = { "gsm", @@ -239,81 +151,6 @@ AVInputFormat gsm_demuxer = { }; #endif -#if CONFIG_H261_MUXER -AVOutputFormat h261_muxer = { - "h261", - NULL_IF_CONFIG_SMALL("raw H.261"), - "video/x-h261", - "h261", - 0, - CODEC_ID_NONE, - CODEC_ID_H261, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_H263_MUXER -AVOutputFormat h263_muxer = { - "h263", - NULL_IF_CONFIG_SMALL("raw H.263"), - "video/x-h263", - "h263", - 0, - CODEC_ID_NONE, - CODEC_ID_H263, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_H264_MUXER -AVOutputFormat h264_muxer = { - "h264", - NULL_IF_CONFIG_SMALL("raw H.264 video format"), - NULL, - "h264", - 0, - CODEC_ID_NONE, - CODEC_ID_H264, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_CAVSVIDEO_MUXER -AVOutputFormat cavsvideo_muxer = { - "cavsvideo", - NULL_IF_CONFIG_SMALL("raw Chinese AVS video"), - NULL, - "cavs", - 0, - CODEC_ID_NONE, - CODEC_ID_CAVS, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_M4V_MUXER -AVOutputFormat m4v_muxer = { - "m4v", - NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), - NULL, - "m4v", - 0, - CODEC_ID_NONE, - CODEC_ID_MPEG4, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - #if CONFIG_MJPEG_DEMUXER AVInputFormat mjpeg_demuxer = { "mjpeg", @@ -328,21 +165,6 @@ AVInputFormat mjpeg_demuxer = { }; #endif -#if CONFIG_MJPEG_MUXER -AVOutputFormat mjpeg_muxer = { - "mjpeg", - NULL_IF_CONFIG_SMALL("raw MJPEG video"), - "video/x-mjpeg", - "mjpg,mjpeg", - 0, - CODEC_ID_NONE, - CODEC_ID_MJPEG, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - #if CONFIG_MLP_DEMUXER AVInputFormat mlp_demuxer = { "mlp", @@ -357,33 +179,6 @@ AVInputFormat mlp_demuxer = { }; #endif -#if CONFIG_MLP_MUXER -AVOutputFormat mlp_muxer = { - "mlp", - NULL_IF_CONFIG_SMALL("raw MLP"), - NULL, - "mlp", - 0, - CODEC_ID_MLP, - CODEC_ID_NONE, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_SRT_MUXER -AVOutputFormat srt_muxer = { - .name = "srt", - .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle format"), - .mime_type = "application/x-subrip", - .extensions = "srt", - .write_packet = ff_raw_write_packet, - .flags = AVFMT_NOTIMESTAMPS, - .subtitle_codec = CODEC_ID_SRT, -}; -#endif - #if CONFIG_TRUEHD_DEMUXER AVInputFormat truehd_demuxer = { "truehd", @@ -398,66 +193,6 @@ AVInputFormat truehd_demuxer = { }; #endif -#if CONFIG_TRUEHD_MUXER -AVOutputFormat truehd_muxer = { - "truehd", - NULL_IF_CONFIG_SMALL("raw TrueHD"), - NULL, - "thd", - 0, - CODEC_ID_TRUEHD, - CODEC_ID_NONE, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_MPEG1VIDEO_MUXER -AVOutputFormat mpeg1video_muxer = { - "mpeg1video", - NULL_IF_CONFIG_SMALL("raw MPEG-1 video"), - "video/x-mpeg", - "mpg,mpeg,m1v", - 0, - CODEC_ID_NONE, - CODEC_ID_MPEG1VIDEO, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_MPEG2VIDEO_MUXER -AVOutputFormat mpeg2video_muxer = { - "mpeg2video", - NULL_IF_CONFIG_SMALL("raw MPEG-2 video"), - NULL, - "m2v", - 0, - CODEC_ID_NONE, - CODEC_ID_MPEG2VIDEO, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_RAWVIDEO_MUXER -AVOutputFormat rawvideo_muxer = { - "rawvideo", - NULL_IF_CONFIG_SMALL("raw video format"), - NULL, - "yuv,rgb", - 0, - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - NULL, - ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - #if CONFIG_SHORTEN_DEMUXER AVInputFormat shorten_demuxer = { "shn", diff --git a/libavformat/raw.h b/libavformat/rawdec.h index 9621e0c45d..0b0cf1beef 100644 --- a/libavformat/raw.h +++ b/libavformat/rawdec.h @@ -1,5 +1,5 @@ /* - * RAW muxer and demuxer + * RAW demuxers * Copyright (C) 2007 Aurelien Jacobs <aurel@gnuage.org> * * This file is part of FFmpeg. @@ -19,13 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_RAW_H -#define AVFORMAT_RAW_H +#ifndef AVFORMAT_RAWDEC_H +#define AVFORMAT_RAWDEC_H #include "avformat.h" -int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt); - int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap); int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt); @@ -34,4 +32,4 @@ int ff_raw_audio_read_header(AVFormatContext *s, AVFormatParameters *ap); int ff_raw_video_read_header(AVFormatContext *s, AVFormatParameters *ap); -#endif /* AVFORMAT_RAW_H */ +#endif /* AVFORMAT_RAWDEC_H */ diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c new file mode 100644 index 0000000000..119292d428 --- /dev/null +++ b/libavformat/rawenc.c @@ -0,0 +1,285 @@ +/* + * RAW muxers + * Copyright (c) 2001 Fabrice Bellard + * Copyright (c) 2005 Alex Beregszaszi + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avformat.h" +#include "rawenc.h" + +int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + put_buffer(s->pb, pkt->data, pkt->size); + put_flush_packet(s->pb); + return 0; +} + +/* Note: Do not forget to add new entries to the Makefile as well. */ + +#if CONFIG_AC3_MUXER +AVOutputFormat ac3_muxer = { + "ac3", + NULL_IF_CONFIG_SMALL("raw AC-3"), + "audio/x-ac3", + "ac3", + 0, + CODEC_ID_AC3, + CODEC_ID_NONE, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_DIRAC_MUXER +AVOutputFormat dirac_muxer = { + "dirac", + NULL_IF_CONFIG_SMALL("raw Dirac"), + NULL, + "drc", + 0, + CODEC_ID_NONE, + CODEC_ID_DIRAC, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_DNXHD_MUXER +AVOutputFormat dnxhd_muxer = { + "dnxhd", + NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), + NULL, + "dnxhd", + 0, + CODEC_ID_NONE, + CODEC_ID_DNXHD, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_DTS_MUXER +AVOutputFormat dts_muxer = { + "dts", + NULL_IF_CONFIG_SMALL("raw DTS"), + "audio/x-dca", + "dts", + 0, + CODEC_ID_DTS, + CODEC_ID_NONE, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_EAC3_MUXER +AVOutputFormat eac3_muxer = { + "eac3", + NULL_IF_CONFIG_SMALL("raw E-AC-3"), + "audio/x-eac3", + "eac3", + 0, + CODEC_ID_EAC3, + CODEC_ID_NONE, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_H261_MUXER +AVOutputFormat h261_muxer = { + "h261", + NULL_IF_CONFIG_SMALL("raw H.261"), + "video/x-h261", + "h261", + 0, + CODEC_ID_NONE, + CODEC_ID_H261, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_H263_MUXER +AVOutputFormat h263_muxer = { + "h263", + NULL_IF_CONFIG_SMALL("raw H.263"), + "video/x-h263", + "h263", + 0, + CODEC_ID_NONE, + CODEC_ID_H263, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_H264_MUXER +AVOutputFormat h264_muxer = { + "h264", + NULL_IF_CONFIG_SMALL("raw H.264 video format"), + NULL, + "h264", + 0, + CODEC_ID_NONE, + CODEC_ID_H264, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_CAVSVIDEO_MUXER +AVOutputFormat cavsvideo_muxer = { + "cavsvideo", + NULL_IF_CONFIG_SMALL("raw Chinese AVS video"), + NULL, + "cavs", + 0, + CODEC_ID_NONE, + CODEC_ID_CAVS, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_M4V_MUXER +AVOutputFormat m4v_muxer = { + "m4v", + NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), + NULL, + "m4v", + 0, + CODEC_ID_NONE, + CODEC_ID_MPEG4, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_MJPEG_MUXER +AVOutputFormat mjpeg_muxer = { + "mjpeg", + NULL_IF_CONFIG_SMALL("raw MJPEG video"), + "video/x-mjpeg", + "mjpg,mjpeg", + 0, + CODEC_ID_NONE, + CODEC_ID_MJPEG, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_MLP_MUXER +AVOutputFormat mlp_muxer = { + "mlp", + NULL_IF_CONFIG_SMALL("raw MLP"), + NULL, + "mlp", + 0, + CODEC_ID_MLP, + CODEC_ID_NONE, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_SRT_MUXER +AVOutputFormat srt_muxer = { + .name = "srt", + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle format"), + .mime_type = "application/x-subrip", + .extensions = "srt", + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, + .subtitle_codec = CODEC_ID_SRT, +}; +#endif + +#if CONFIG_TRUEHD_MUXER +AVOutputFormat truehd_muxer = { + "truehd", + NULL_IF_CONFIG_SMALL("raw TrueHD"), + NULL, + "thd", + 0, + CODEC_ID_TRUEHD, + CODEC_ID_NONE, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_MPEG1VIDEO_MUXER +AVOutputFormat mpeg1video_muxer = { + "mpeg1video", + NULL_IF_CONFIG_SMALL("raw MPEG-1 video"), + "video/x-mpeg", + "mpg,mpeg,m1v", + 0, + CODEC_ID_NONE, + CODEC_ID_MPEG1VIDEO, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_MPEG2VIDEO_MUXER +AVOutputFormat mpeg2video_muxer = { + "mpeg2video", + NULL_IF_CONFIG_SMALL("raw MPEG-2 video"), + NULL, + "m2v", + 0, + CODEC_ID_NONE, + CODEC_ID_MPEG2VIDEO, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_RAWVIDEO_MUXER +AVOutputFormat rawvideo_muxer = { + "rawvideo", + NULL_IF_CONFIG_SMALL("raw video format"), + NULL, + "yuv,rgb", + 0, + CODEC_ID_NONE, + CODEC_ID_RAWVIDEO, + NULL, + ff_raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif diff --git a/libavformat/rawenc.h b/libavformat/rawenc.h new file mode 100644 index 0000000000..b5523090b8 --- /dev/null +++ b/libavformat/rawenc.h @@ -0,0 +1,29 @@ +/* + * RAW muxers + * Copyright (C) 2007 Aurelien Jacobs <aurel@gnuage.org> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_RAWENC_H +#define AVFORMAT_RAWENC_H + +#include "avformat.h" + +int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt); + +#endif /* AVFORMAT_RAWENC_H */ diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index 1609875854..da613007bf 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "raw.h" +#include "rawdec.h" static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) { |