From 4f1e4eae993a22eff4561c7c05f723f6c9ff94b8 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sat, 10 Dec 2011 22:39:43 +0200 Subject: cosmetics: misc minor cleanups The deleted ZRM* things were only relevant to vo_zr, which was deleted earlier. --- Makefile | 4 ++-- libmpcodecs/img_format.c | 3 --- libmpcodecs/img_format.h | 5 ----- libmpcodecs/mp_image.c | 4 +--- libmpdemux/demux_lavf.c | 2 +- libvo/video_out.h | 1 - mp_msg.c | 4 ++-- 7 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 59cbdc4950..64d94d9bc0 100644 --- a/Makefile +++ b/Makefile @@ -414,12 +414,12 @@ SRCS_COMMON = asxparser.c \ stream/stream_null.c \ stream/url.c \ sub/av_sub.c \ - sub/sub.c \ - sub/sub_cc.c \ sub/dec_sub.c \ sub/find_sub.c \ sub/find_subfiles.c \ sub/spudec.c \ + sub/sub.c \ + sub/sub_cc.c \ sub/subassconvert.c \ sub/subreader.c \ sub/vobsub.c \ diff --git a/libmpcodecs/img_format.c b/libmpcodecs/img_format.c index c4884f3eca..c6d3e82149 100644 --- a/libmpcodecs/img_format.c +++ b/libmpcodecs/img_format.c @@ -102,9 +102,6 @@ const char *vo_format_name(int format) case IMGFMT_YUVP: return "Packed YUVP"; case IMGFMT_UYVP: return "Packed UYVP"; case IMGFMT_MPEGPES: return "Mpeg PES"; - case IMGFMT_ZRMJPEGNI: return "Zoran MJPEG non-interlaced"; - case IMGFMT_ZRMJPEGIT: return "Zoran MJPEG top field first"; - case IMGFMT_ZRMJPEGIB: return "Zoran MJPEG bottom field first"; case IMGFMT_XVMC_MOCO_MPEG2: return "MPEG1/2 Motion Compensation"; case IMGFMT_XVMC_IDCT_MPEG2: return "MPEG1/2 Motion Compensation and IDCT"; case IMGFMT_VDPAU_MPEG1: return "MPEG1 VDPAU acceleration"; diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 3056e29268..d4443af2c9 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -190,11 +190,6 @@ /* Compressed Formats */ #define IMGFMT_MPEGPES (('M'<<24)|('P'<<16)|('E'<<8)|('S')) #define IMGFMT_MJPEG (('M')|('J'<<8)|('P'<<16)|('G'<<24)) -/* Formats that are understood by zoran chips, we include - * non-interlaced, interlaced top-first, interlaced bottom-first */ -#define IMGFMT_ZRMJPEGNI (('Z'<<24)|('R'<<16)|('N'<<8)|('I')) -#define IMGFMT_ZRMJPEGIT (('Z'<<24)|('R'<<16)|('I'<<8)|('T')) -#define IMGFMT_ZRMJPEGIB (('Z'<<24)|('R'<<16)|('I'<<8)|('B')) // I think that this code could not be used by any other codec/format #define IMGFMT_XVMC 0x1DC70000 diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c index 4683f41174..45426eb673 100644 --- a/libmpcodecs/mp_image.c +++ b/libmpcodecs/mp_image.c @@ -99,9 +99,7 @@ void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){ mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED); mpi->imgfmt=out_fmt; // compressed formats - if(out_fmt == IMGFMT_MPEGPES || - out_fmt == IMGFMT_ZRMJPEGNI || out_fmt == IMGFMT_ZRMJPEGIT || out_fmt == IMGFMT_ZRMJPEGIB || - IMGFMT_IS_HWACCEL(out_fmt)){ + if(out_fmt == IMGFMT_MPEGPES || IMGFMT_IS_HWACCEL(out_fmt)){ mpi->bpp=0; return; } diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 5fb66adb9d..f8311e215c 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -517,7 +517,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) AVCodec *avc = avcodec_find_decoder(codec->codec_id); const char *codec_name = avc ? avc->name : "unknown"; if (!avc && *stream_type == 's' && demuxer->s_streams[i]) - codec_name = sh_sub_type2str(((sh_sub_t *)demuxer->s_streams[i])->type); + codec_name = sh_sub_type2str((demuxer->s_streams[i])->type); mp_msg(MSGT_DEMUX, MSGL_INFO, "[lavf] stream %d: %s (%s), -%cid %d", i, stream_type, codec_name, *stream_type, stream_id); if (lang && lang->value && *stream_type != 'v') diff --git a/libvo/video_out.h b/libvo/video_out.h index 554b97d207..3dd3ca8a8d 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -378,7 +378,6 @@ struct vo_rect { void calc_src_dst_rects(struct vo *vo, int src_width, int src_height, struct vo_rect *src, struct vo_rect *dst, struct vo_rect *borders, const struct vo_rect *crop); -struct input_ctx; void vo_mouse_movement(struct vo *vo, int posx, int posy); static inline int aspect_scaling(void) diff --git a/mp_msg.c b/mp_msg.c index ac520951ae..7b97d286e4 100644 --- a/mp_msg.c +++ b/mp_msg.c @@ -339,7 +339,7 @@ char *mp_gtext(const char *string) * couple of reasons (locale stuff is badly designed and sucks in * general). * - * First setting the locale, especially LC_CTYPE, changes the + * First, setting the locale, especially LC_CTYPE, changes the * behavior of various C functions and we don't want that - we * want isalpha() for example to always behave like in the C * locale. @@ -361,7 +361,7 @@ char *mp_gtext(const char *string) * affect gettext itself because it supports specifying the * character set directly with bind_textdomain_codeset()). * - * So the only solution (at leat short of trying to work around + * So the only solution (at least short of trying to work around * things possibly producing non-utf-8 output) is to leave all the * locale variables unset. Note that this means it's not possible * to get translated output from any libraries we call if they -- cgit v1.2.3