diff options
| author | Stefan Gehrer <stefan.gehrer@gmx.de> | 2010-07-27 07:18:36 +0000 |
|---|---|---|
| committer | Stefan Gehrer <stefan.gehrer@gmx.de> | 2010-07-27 07:18:36 +0000 |
| commit | de29597680815bfdb0c1de3dcf02355bdf534b8f (patch) | |
| tree | dafa404d4f0df2297db3069027a031f11e2e27e1 /libavformat | |
| parent | 54d1d1ba17af8092529096bd252f7ec73053c65e (diff) | |
| download | ffmpeg-de29597680815bfdb0c1de3dcf02355bdf534b8f.tar.gz | |
add Chinese AVS encoding via external library libxavs
Originally committed as revision 24533 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/raw.c | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 0b39e84adb..9a6a549c2c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -69,7 +69,7 @@ void av_register_all(void) REGISTER_DEMUXER (BINK, bink); REGISTER_DEMUXER (C93, c93); REGISTER_DEMUXER (CAF, caf); - REGISTER_DEMUXER (CAVSVIDEO, cavsvideo); + REGISTER_MUXDEMUX (CAVSVIDEO, cavsvideo); REGISTER_DEMUXER (CDG, cdg); REGISTER_MUXER (CRC, crc); REGISTER_MUXDEMUX (DAUD, daud); diff --git a/libavformat/raw.c b/libavformat/raw.c index dc48c91a46..e721649e54 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -981,6 +981,22 @@ AVOutputFormat h264_muxer = { }; #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, + raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, + .extensions = "avs", +}; +#endif + #if CONFIG_INGENIENT_DEMUXER AVInputFormat ingenient_demuxer = { "ingenient", |