diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-07-10 21:14:37 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-07-10 21:14:37 +0000 |
| commit | ff70e60176056daf646109b8e42654a3036fa02b (patch) | |
| tree | 42e32d1e4bff334964cf93766ff2da6ee9a8f1d3 /libavformat/mpjpeg.c | |
| parent | 4cac0d5589ab1a076e977425925015f2c8e591a8 (diff) | |
allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpjpeg.c')
| -rw-r--r-- | libavformat/mpjpeg.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index 2f2da0586a..72d8e82a0d 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -22,7 +22,6 @@ #define BOUNDARY_TAG "ffserver" -#ifdef CONFIG_MUXERS static int mpjpeg_write_header(AVFormatContext *s) { uint8_t buf1[256]; @@ -52,7 +51,7 @@ static int mpjpeg_write_trailer(AVFormatContext *s) return 0; } -static AVOutputFormat mpjpeg_muxer = { +AVOutputFormat mpjpeg_muxer = { "mpjpeg", "Mime multipart JPEG format", "multipart/x-mixed-replace;boundary=" BOUNDARY_TAG, @@ -64,10 +63,3 @@ static AVOutputFormat mpjpeg_muxer = { mpjpeg_write_packet, mpjpeg_write_trailer, }; - -int jpeg_init(void) -{ - av_register_output_format(&mpjpeg_muxer); - return 0; -} -#endif //CONFIG_MUXERS |