Commit 3aa180b8 authored by Alex Beregszaszi's avatar Alex Beregszaszi

initial nut muxer and demuxer (demuxer is not fail safe)

Originally committed as revision 2211 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8026c3b5
...@@ -14,7 +14,8 @@ PPOBJS= ...@@ -14,7 +14,8 @@ PPOBJS=
# mux and demuxes # mux and demuxes
OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o raw.o rm.o \ OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o raw.o rm.o \
avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dvcore.o dv.o \ avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dvcore.o dv.o \
yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
nut.o
ifeq ($(CONFIG_RISKY),yes) ifeq ($(CONFIG_RISKY),yes)
OBJS+= asf.o OBJS+= asf.o
......
...@@ -78,6 +78,8 @@ void av_register_all(void) ...@@ -78,6 +78,8 @@ void av_register_all(void)
dv1394_init(); dv1394_init();
#endif #endif
nut_init();
/* image formats */ /* image formats */
av_register_image_format(&pnm_image_format); av_register_image_format(&pnm_image_format);
av_register_image_format(&pbm_image_format); av_register_image_format(&pbm_image_format);
......
...@@ -392,6 +392,9 @@ int roq_init(void); ...@@ -392,6 +392,9 @@ int roq_init(void);
/* ipmovie.c */ /* ipmovie.c */
int ipmovie_init(void); int ipmovie_init(void);
/* nut.c */
int nut_init(void);
#include "rtp.h" #include "rtp.h"
#include "rtsp.h" #include "rtsp.h"
......
...@@ -184,6 +184,21 @@ unsigned int codec_get_bmp_tag(int id) ...@@ -184,6 +184,21 @@ unsigned int codec_get_bmp_tag(int id)
return codec_get_tag(codec_bmp_tags, id); return codec_get_tag(codec_bmp_tags, id);
} }
unsigned int codec_get_wav_tag(int id)
{
return codec_get_tag(codec_wav_tags, id);
}
enum CodecID codec_get_bmp_id(unsigned int tag)
{
return codec_get_id(codec_bmp_tags, tag);
}
enum CodecID codec_get_wav_id(unsigned int tag)
{
return codec_get_id(codec_wav_tags, tag);
}
/* BITMAPINFOHEADER header */ /* BITMAPINFOHEADER header */
void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const CodecTag *tags, int for_asf) void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const CodecTag *tags, int for_asf)
{ {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment