Commit ce02f9be authored by anatoly's avatar anatoly Committed by Anton Khirnov

Add MxPEG decoder

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent e0e3b8b2
...@@ -82,6 +82,7 @@ version <next>: ...@@ -82,6 +82,7 @@ version <next>:
- sndio support for playback and record - sndio support for playback and record
- Linux framebuffer input device added - Linux framebuffer input device added
- Chronomaster DFA decoder - Chronomaster DFA decoder
- Mobotix MxPEG decoder
version 0.6: version 0.6:
......
...@@ -443,6 +443,7 @@ following image formats are supported: ...@@ -443,6 +443,7 @@ following image formats are supported:
@item Miro VideoXL @tab @tab X @item Miro VideoXL @tab @tab X
@tab fourcc: VIXL @tab fourcc: VIXL
@item MJPEG (Motion JPEG) @tab X @tab X @item MJPEG (Motion JPEG) @tab X @tab X
@item Mobotix MxPEG video @tab @tab X
@item Motion Pixels video @tab @tab X @item Motion Pixels video @tab @tab X
@item MPEG-1 video @tab X @tab X @item MPEG-1 video @tab X @tab X
@item MPEG-1/2 video XvMC (X-Video Motion Compensation) @tab @tab X @item MPEG-1/2 video XvMC (X-Video Motion Compensation) @tab @tab X
......
...@@ -271,6 +271,7 @@ OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \ ...@@ -271,6 +271,7 @@ OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \
OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o
OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o
OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o
OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o
OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o
OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o
......
...@@ -153,6 +153,7 @@ void avcodec_register_all(void) ...@@ -153,6 +153,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (MSRLE, msrle); REGISTER_DECODER (MSRLE, msrle);
REGISTER_DECODER (MSVIDEO1, msvideo1); REGISTER_DECODER (MSVIDEO1, msvideo1);
REGISTER_DECODER (MSZH, mszh); REGISTER_DECODER (MSZH, mszh);
REGISTER_DECODER (MXPEG, mxpeg);
REGISTER_DECODER (NUV, nuv); REGISTER_DECODER (NUV, nuv);
REGISTER_ENCDEC (PAM, pam); REGISTER_ENCDEC (PAM, pam);
REGISTER_ENCDEC (PBM, pbm); REGISTER_ENCDEC (PBM, pbm);
......
This diff is collapsed.
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H #define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 116 #define LIBAVCODEC_VERSION_MINOR 117
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
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