From b282622c71a29cfa33f7ff6eab25df4e71664027 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 14 Oct 2008 08:56:48 +0000 Subject: Remove duplicate extern declaration, fixes the warning: libmpcodecs/vf_zrmjpeg.c:73: warning: redundant redeclaration of 'avcodec_initialized' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27766 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_zrmjpeg.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'libmpcodecs/vf_zrmjpeg.c') diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 82001a8d72..b86d7147bd 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -57,8 +57,6 @@ #undef free #undef realloc -extern int avcodec_initialized; - /* some convenient #define's, is this portable enough? */ /// Printout with vf_zrmjpeg: prefix at VERBOSE level #define VERBOSE(...) mp_msg(MSGT_DECVIDEO, MSGL_V, "vf_zrmjpeg: " __VA_ARGS__) -- cgit v1.2.3 From 49faefb6698332252ab115d3d1a8ce882f7d3873 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 14 Oct 2008 09:04:40 +0000 Subject: Remove useless '#undef realloc', realloc is not referenced anywhere near. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27767 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_zrmjpeg.c | 1 - 1 file changed, 1 deletion(-) (limited to 'libmpcodecs/vf_zrmjpeg.c') diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index b86d7147bd..a94e63723e 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -55,7 +55,6 @@ #undef malloc #undef free -#undef realloc /* some convenient #define's, is this portable enough? */ /// Printout with vf_zrmjpeg: prefix at VERBOSE level -- cgit v1.2.3 From 1a85bf593b1b58f17fe1aa970612126cddcffb7f Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 14 Oct 2008 16:04:09 +0000 Subject: #include necessary libavcodec header and remove duplicated struct declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27769 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_zrmjpeg.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'libmpcodecs/vf_zrmjpeg.c') diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index a94e63723e..0d45666aa4 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -49,8 +49,7 @@ * be2me_32, otherwise the linker will complain that it doesn't exist */ #define HAVE_AV_CONFIG_H #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" -#include "libavcodec/mpegvideo.h" +#include "libavcodec/mjpegenc.h" //#include "jpeg_enc.h" /* this file is not present yet */ #undef malloc @@ -69,21 +68,6 @@ // set when init is done, so that initialization is not done twice. extern int avcodec_initialized; -/// structure copied from mjpeg.c -/* zrmjpeg_encode_mb needs access to these tables for the black & white - * option */ -typedef struct MJpegContext { - uint8_t huff_size_dc_luminance[12]; - uint16_t huff_code_dc_luminance[12]; - uint8_t huff_size_dc_chrominance[12]; - uint16_t huff_code_dc_chrominance[12]; - - uint8_t huff_size_ac_luminance[256]; - uint16_t huff_code_ac_luminance[256]; - uint8_t huff_size_ac_chrominance[256]; - uint16_t huff_code_ac_chrominance[256]; -} MJpegContext; - /// The get_pixels() routine to use. The real routine comes from dsputil static void (*get_pixels)(DCTELEM *restrict block, const uint8_t *pixels, int line_size); -- cgit v1.2.3