Start working on a branch where FFmpeg is not copied, patched and carved to be built with automake but instead imported inline and built using its own build system. This is an import of a slightly modified FFmpeg current tree. xine-lib builds, install and run fine with it, but there are of course plenty of things that needs to be fixed before it can even be considered for a 1.2.x series. Work will continue in the next days of course.

CVS patchset: 8397
CVS date: 2006/12/02 01:19:48

1 files changed, 0 insertions, 19 deletions

diff --git a/src/libffmpeg/libavcodec/rtjpeg.h b/src/libffmpeg/libavcodec/rtjpeg.h
deleted file mode 100644
index 1fc2fc934..000000000
--- a/src/libffmpeg/libavcodec/rtjpeg.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef RTJPEG_H
-#define RTJPEG_H
-
-typedef struct {
-    int w, h;
-    DSPContext *dsp;
-    DCTELEM block[64];
-    uint8_t scan[64];
-    uint32_t lquant[64];
-    uint32_t cquant[64];
-} RTJpegContext;
-
-void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
-                        int width, int height,
-                        uint32_t *lquant, uint32_t *cquant);
-
-int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
-                               uint8_t *buf, int buf_size);
-#endif