summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-11-17 06:56:29 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-11-17 06:56:29 +0200
commit34279a8ce3c02bb744c635bfa9650494a68a333b (patch)
treedb8d24c8fadff55a3cbd2d074ada65ecd57baa6d
parent53ecafadc8bddc68f7cddecd6e4675bcdaf4a8fd (diff)
downloadmpv-34279a8ce3c02bb744c635bfa9650494a68a333b.tar.bz2
mpv-34279a8ce3c02bb744c635bfa9650494a68a333b.tar.xz
cosmetics: remove some unused variables
-rw-r--r--libmpcodecs/ad_ffmpeg.c1
-rw-r--r--libvo/vo_vdpau.c1
-rw-r--r--libvo/vo_xv.c2
-rw-r--r--libvo/x11_common.c3
-rw-r--r--mplayer.c1
5 files changed, 0 insertions, 8 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index 8d8c040560..769425d9a4 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -179,7 +179,6 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
if (((AVCodecContext *)sh_audio->context)->channels >= 5) {
int samplesize = av_get_bits_per_sample_format(((AVCodecContext *)
sh_audio->context)->sample_fmt) / 8;
- const char *codec=((AVCodecContext*)sh_audio->context)->codec->name;
reorder_channel_nch(buf, AF_CHANNEL_LAYOUT_LAVC_DEFAULT,
AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT,
((AVCodecContext *)sh_audio->context)->channels,
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 248991712f..a06c421301 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -1676,7 +1676,6 @@ static int get_equalizer(struct vo *vo, const char *name, int *value)
static int set_equalizer(struct vo *vo, const char *name, int value)
{
struct vdpctx *vc = vo->priv;
- struct vdp_functions *vdp = vc->vdp;
if (!strcasecmp(name, "brightness"))
vc->procamp.brightness = value / 100.0;
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 9a030ac71c..7ab087c039 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -196,7 +196,6 @@ static int config(struct vo *vo, uint32_t width, uint32_t height,
uint32_t d_width, uint32_t d_height, uint32_t flags,
char *title, uint32_t format)
{
- struct MPOpts *opts = vo->opts;
struct vo_x11_state *x11 = vo->x11;
XVisualInfo vinfo;
XSetWindowAttributes xswa;
@@ -414,7 +413,6 @@ static void copy_backup_image(struct vo *vo, int dest, int src)
static void check_events(struct vo *vo)
{
struct xvctx *ctx = vo->priv;
- struct vo_x11_state *x11 = vo->x11;
int e = vo_x11_check_events(vo);
if (e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE)
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 0c931c9833..ea1f53971a 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -765,7 +765,6 @@ void vo_x11_uninit(struct vo *vo)
int vo_x11_check_events(struct vo *vo)
{
struct vo_x11_state *x11 = vo->x11;
- struct MPOpts *opts = vo->opts;
Display *display = vo->x11->display;
int ret = 0;
XEvent Event;
@@ -790,8 +789,6 @@ int vo_x11_check_events(struct vo *vo)
ret |= VO_EVENT_EXPOSE;
break;
case ConfigureNotify:
-// if (!vo_fs && (Event.xconfigure.width == opts->vo_screenwidth || Event.xconfigure.height == opts->vo_screenheight)) break;
-// if (vo_fs && Event.xconfigure.width != opts->vo_screenwidth && Event.xconfigure.height != opts->vo_screenheight) break;
if (x11->window == None)
break;
{
diff --git a/mplayer.c b/mplayer.c
index fd5623ff58..fd29a7306b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1987,7 +1987,6 @@ static void mp_dvdnav_save_smpi(struct MPContext *mpctx, int in_size,
*/
static void adjust_sync(struct MPContext *mpctx, double frame_time)
{
- struct MPOpts *opts = &mpctx->opts;
current_module = "av_sync";
if (!mpctx->sh_audio)