Commit 86329cce authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

GXF muxer

Originally committed as revision 5787 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1d94a662
...@@ -191,6 +191,7 @@ Muxers/Demuxers: ...@@ -191,6 +191,7 @@ Muxers/Demuxers:
flic.c Mike Melanson flic.c Mike Melanson
flvdec.c, flvenc.c Michael Niedermayer flvdec.c, flvenc.c Michael Niedermayer
gxf.c Reimar Doeffinger gxf.c Reimar Doeffinger
gxfenc.c Baptiste Coudurier
idcin.c Mike Melanson idcin.c Mike Melanson
idroq.c Mike Melanson idroq.c Mike Melanson
ipmovie.c Mike Melanson ipmovie.c Mike Melanson
......
...@@ -183,6 +183,10 @@ ifeq ($(CONFIG_LIBOGG),yes) ...@@ -183,6 +183,10 @@ ifeq ($(CONFIG_LIBOGG),yes)
OBJS-$(CONFIG_OGG_MUXER) += ogg.o OBJS-$(CONFIG_OGG_MUXER) += ogg.o
endif endif
ifeq ($(CONFIG_GPL),yes)
OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o
endif
OBJS += $(OBJS-yes) OBJS += $(OBJS-yes)
NAME=avformat NAME=avformat
......
...@@ -138,6 +138,9 @@ void av_register_all(void) ...@@ -138,6 +138,9 @@ void av_register_all(void)
#ifdef CONFIG_GXF_DEMUXER #ifdef CONFIG_GXF_DEMUXER
av_register_input_format(&gxf_demuxer); av_register_input_format(&gxf_demuxer);
#endif #endif
#if defined(CONFIG_GXF_MUXER) && defined(CONFIG_GPL)
av_register_output_format(&gxf_muxer);
#endif
#ifdef CONFIG_IDCIN_DEMUXER #ifdef CONFIG_IDCIN_DEMUXER
av_register_input_format(&idcin_demuxer); av_register_input_format(&idcin_demuxer);
#endif #endif
......
...@@ -35,6 +35,7 @@ extern AVInputFormat gif_demuxer; ...@@ -35,6 +35,7 @@ extern AVInputFormat gif_demuxer;
extern AVInputFormat video_grab_device_demuxer; extern AVInputFormat video_grab_device_demuxer;
extern AVInputFormat video_grab_device_demuxer; extern AVInputFormat video_grab_device_demuxer;
extern AVInputFormat gxf_demuxer; extern AVInputFormat gxf_demuxer;
extern AVOutputFormat gxf_muxer;
extern AVInputFormat idcin_demuxer; extern AVInputFormat idcin_demuxer;
extern AVInputFormat roq_demuxer; extern AVInputFormat roq_demuxer;
extern AVInputFormat image2_demuxer; extern AVInputFormat image2_demuxer;
......
#ifndef FFMPEG_GXF_H
#define FFMPEG_GXF_H
/* gxf.c */
typedef enum {
PKT_MAP = 0xbc,
PKT_MEDIA = 0xbf,
PKT_EOS = 0xfb,
PKT_FLT = 0xfc,
PKT_UMF = 0xfd
} pkt_type_t;
#endif /* FFMPEG_GXF_H */
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