diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-12-30 22:25:04 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-12-30 22:25:04 +0000 |
| commit | 9933f7b36c7e2218888d40b577ec93952015d1c3 (patch) | |
| tree | 19922f9bc6068c2430e0152f08f4aef9cc2ba8cd | |
| parent | f6a2ee782d1631fc2e3b587061d2f1e8f020c632 (diff) | |
| download | xine-lib-9933f7b36c7e2218888d40b577ec93952015d1c3.tar.gz xine-lib-9933f7b36c7e2218888d40b577ec93952015d1c3.tar.bz2 | |
When building encoders, mjpeg is needed too.
Otherwise we get a link error about mjpeg_init being missing.
CVS patchset: 8478
CVS date: 2006/12/30 22:25:04
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 19 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/mjpeg.c | 7 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 3dfb43dc3..7e19e643c 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -64,6 +64,25 @@ Index: libavcodec/motion_est.c } + +#endif /* CONFIG_ENCODERS */ +Index: libavcodec/mjpeg.c +=================================================================== +diff -u -r1.38 mjpeg.c +--- libavcodec/mjpeg.c 4 Dec 2006 22:25:19 -0000 1.38 ++++ libavcodec/mjpeg.c 30 Dec 2006 22:21:34 -0000 +@@ -38,6 +38,13 @@ + #include "mpegvideo.h" + #include "bytestream.h" + ++/* if xine's MPEG encoder is enabled, enable the encoding features in ++ * this particular module */ ++#if defined(XINE_MPEG_ENCODER) && !defined(CONFIG_ENCODERS) ++#define CONFIG_ENCODERS ++#endif ++ ++ + /* use two quantizer tables (one for luminance and one for chrominance) */ + /* not yet working */ + #undef TWOMATRIXES Index: libavcodec/mpeg12.c =================================================================== --- libavcodec/mpeg12.c (revision 7221) diff --git a/src/libffmpeg/libavcodec/mjpeg.c b/src/libffmpeg/libavcodec/mjpeg.c index 3d8383e7b..8352782c4 100644 --- a/src/libffmpeg/libavcodec/mjpeg.c +++ b/src/libffmpeg/libavcodec/mjpeg.c @@ -38,6 +38,13 @@ #include "mpegvideo.h" #include "bytestream.h" +/* if xine's MPEG encoder is enabled, enable the encoding features in + * this particular module */ +#if defined(XINE_MPEG_ENCODER) && !defined(CONFIG_ENCODERS) +#define CONFIG_ENCODERS +#endif + + /* use two quantizer tables (one for luminance and one for chrominance) */ /* not yet working */ #undef TWOMATRIXES |