[MPlayer-cvslog] r18963 - in trunk: libmpcodecs/ad_hwmpa.c libmpdemux/aviheader.c libmpdemux/demux_demuxers.c libmpdemux/demux_gif.c libmpdemux/demux_lmlm4.c libmpdemux/demux_mov.c libmpdemux/demux_mpg.c libmpdemux/demux_nuv.c libmpdemux/demux_ogg.c libmpdemux/demux_realaud.c libmpdemux/demux_ty.c libmpdemux/demux_ty_osd.c libmpdemux/http.c libmpdemux/muxer_avi.c libmpdemux/muxer_mpeg.c libmpdemux/tvi_v4l2.c m_option.c
diego
subversion at mplayerhq.hu
Sat Jul 8 19:28:37 CEST 2006
Author: diego
Date: Sat Jul 8 19:28:36 2006
New Revision: 18963
Modified:
trunk/libmpcodecs/ad_hwmpa.c
trunk/libmpdemux/aviheader.c
trunk/libmpdemux/demux_demuxers.c
trunk/libmpdemux/demux_gif.c
trunk/libmpdemux/demux_lmlm4.c
trunk/libmpdemux/demux_mov.c
trunk/libmpdemux/demux_mpg.c
trunk/libmpdemux/demux_nuv.c
trunk/libmpdemux/demux_ogg.c
trunk/libmpdemux/demux_realaud.c
trunk/libmpdemux/demux_ty.c
trunk/libmpdemux/demux_ty_osd.c
trunk/libmpdemux/http.c
trunk/libmpdemux/muxer_avi.c
trunk/libmpdemux/muxer_mpeg.c
trunk/libmpdemux/tvi_v4l2.c
trunk/m_option.c
Log:
Remove unused variables, patch by Stefan Huehner stefan at huehner org.
Modified: trunk/libmpcodecs/ad_hwmpa.c
==============================================================================
--- trunk/libmpcodecs/ad_hwmpa.c (original)
+++ trunk/libmpcodecs/ad_hwmpa.c Sat Jul 8 19:28:36 2006
@@ -109,7 +109,7 @@
static int control(sh_audio_t *sh,int cmd,void* arg, ...)
{
- int start, len, n;
+ int start, len;
switch(cmd)
{
Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c (original)
+++ trunk/libmpdemux/aviheader.c Sat Jul 8 19:28:36 2006
@@ -358,8 +358,6 @@
demuxer->movi_end=stream_tell(demuxer->stream); // fixup movi-end
if(index_mode && !priv->isodml){
int i;
- off_t base = 0;
- uint32_t last_off = 0;
priv->idx_size=size2>>4;
mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_ReadingIndexBlockChunksForFrames,
priv->idx_size,avih.dwTotalFrames, (int64_t)stream_tell(demuxer->stream));
@@ -443,7 +441,6 @@
if (priv->isodml && (index_mode==-1 || index_mode==0 || index_mode==1)) {
int i, j, k;
- int safety=1000;
avisuperindex_chunk *cx;
AVIINDEXENTRY *idx;
Modified: trunk/libmpdemux/demux_demuxers.c
==============================================================================
--- trunk/libmpdemux/demux_demuxers.c (original)
+++ trunk/libmpdemux/demux_demuxers.c Sat Jul 8 19:28:36 2006
@@ -86,7 +86,6 @@
}
static void demux_close_demuxers(demuxer_t* demuxer) {
- int i;
dd_priv_t* priv = demuxer->priv;
stream_t *s;
Modified: trunk/libmpdemux/demux_gif.c
==============================================================================
--- trunk/libmpdemux/demux_gif.c (original)
+++ trunk/libmpdemux/demux_gif.c Sat Jul 8 19:28:36 2006
@@ -39,7 +39,6 @@
static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds)
{
GifFileType *gif = (GifFileType *)demuxer->priv;
- sh_video_t *sh_video = (sh_video_t *)demuxer->video->sh;
GifRecordType type = UNDEFINED_RECORD_TYPE;
int len = 0;
demux_packet_t *dp = NULL;
Modified: trunk/libmpdemux/demux_lmlm4.c
==============================================================================
--- trunk/libmpdemux/demux_lmlm4.c (original)
+++ trunk/libmpdemux/demux_lmlm4.c Sat Jul 8 19:28:36 2006
@@ -127,7 +127,6 @@
static int getFrame(demuxer_t *demuxer, FrameInfo *frameInfo)
{
- int retCode;
unsigned int packetSize;
frameInfo->channelNo = stream_read_word(demuxer->stream);
Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c (original)
+++ trunk/libmpdemux/demux_mov.c Sat Jul 8 19:28:36 2006
@@ -412,7 +412,6 @@
skipped+=8;
i = stream_read_dword(demuxer->stream)-8;
if(stream_read_dword(demuxer->stream)==MOV_FOURCC('r','m','r','a')){
- int ref=0;
skipped+=i;
mp_msg(MSGT_DEMUX,MSGL_INFO,"MOV: Reference Media file!!!\n");
//set demuxer type to playlist ...
Modified: trunk/libmpdemux/demux_mpg.c
==============================================================================
--- trunk/libmpdemux/demux_mpg.c (original)
+++ trunk/libmpdemux/demux_mpg.c Sat Jul 8 19:28:36 2006
@@ -798,8 +798,6 @@
}
int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){
- demux_stream_t *d_video=demuxer->video;
- sh_video_t *sh_video=d_video->sh;
mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv;
int msec = 0;
Modified: trunk/libmpdemux/demux_nuv.c
==============================================================================
--- trunk/libmpdemux/demux_nuv.c (original)
+++ trunk/libmpdemux/demux_nuv.c Sat Jul 8 19:28:36 2006
@@ -226,7 +226,6 @@
/* Scan for the extended data in MythTV nuv streams */
static int demux_xscan_nuv(demuxer_t* demuxer, int width, int height) {
int i;
- int res = 0;
off_t orig_pos = stream_tell(demuxer->stream);
struct rtframeheader rtjpeg_frameheader;
struct extendeddata ext;
Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c (original)
+++ trunk/libmpdemux/demux_ogg.c Sat Jul 8 19:28:36 2006
@@ -1436,7 +1436,6 @@
ogg_stream_state* oss;
ogg_stream_t* os;
demux_stream_t* ds;
- sh_audio_t* sh_audio = demuxer->audio->sh;
ogg_packet op;
float rate;
int i,sp,first,precision=1,do_seek=1;
Modified: trunk/libmpdemux/demux_realaud.c
==============================================================================
--- trunk/libmpdemux/demux_realaud.c (original)
+++ trunk/libmpdemux/demux_realaud.c Sat Jul 8 19:28:36 2006
@@ -73,8 +73,6 @@
{
ra_priv_t *ra_priv = demuxer->priv;
int len;
- int timestamp;
- int flags;
demux_stream_t *ds = demuxer->audio;
sh_audio_t *sh = ds->sh;
WAVEFORMATEX *wf = sh->wf;
Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c (original)
+++ trunk/libmpdemux/demux_ty.c Sat Jul 8 19:28:36 2006
@@ -1112,7 +1112,6 @@
{
unsigned char b1;
unsigned char b2;
- unsigned char buffer[ 16 ];
b1 = ( ( ( recPtr[ 0 ] & 0x0f ) << 4 ) |
( ( recPtr[ 1 ] & 0xf0 ) >> 4 ) );
@@ -1145,7 +1144,6 @@
{
unsigned char b1;
unsigned char b2;
- unsigned char buffer[ 16 ];
b1 = ( ( ( recPtr[ 0 ] & 0x0f ) << 4 ) |
( ( recPtr[ 1 ] & 0xf0 ) >> 4 ) );
Modified: trunk/libmpdemux/demux_ty_osd.c
==============================================================================
--- trunk/libmpdemux/demux_ty_osd.c (original)
+++ trunk/libmpdemux/demux_ty_osd.c Sat Jul 8 19:28:36 2006
@@ -84,7 +84,6 @@
static void ty_DrawChar( int *x, int *y, char disChar, int fgColor, int bgColor )
{
- int index;
int cx;
int cy;
Modified: trunk/libmpdemux/http.c
==============================================================================
--- trunk/libmpdemux/http.c (original)
+++ trunk/libmpdemux/http.c Sat Jul 8 19:28:36 2006
@@ -166,7 +166,6 @@
static int scast_streaming_start(stream_t *stream) {
int metaint;
- int fromhdr;
scast_data_t *scast_data;
HTTP_header_t *http_hdr = stream->streaming_ctrl->data;
int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
@@ -856,7 +855,6 @@
static int fixup_open(stream_t *stream,int seekable) {
HTTP_header_t *http_hdr = stream->streaming_ctrl->data;
int is_icy = http_hdr && http_get_field(http_hdr, "Icy-MetaInt");
- char *content_type = http_get_field( http_hdr, "Content-Type" );
int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
stream->type = STREAMTYPE_STREAM;
Modified: trunk/libmpdemux/muxer_avi.c
==============================================================================
--- trunk/libmpdemux/muxer_avi.c (original)
+++ trunk/libmpdemux/muxer_avi.c Sat Jul 8 19:28:36 2006
@@ -274,7 +274,6 @@
FILE *f = muxer->file;
VideoPropHeader vprp;
uint32_t aspect = avi_aspect(muxer->def_v);
- off_t pos;
struct avi_stream_info *vsi = muxer->def_v->priv;
int isodml = vsi->riffofspos > 0;
Modified: trunk/libmpdemux/muxer_mpeg.c
==============================================================================
--- trunk/libmpdemux/muxer_mpeg.c (original)
+++ trunk/libmpdemux/muxer_mpeg.c Sat Jul 8 19:28:36 2006
@@ -1101,8 +1101,7 @@
//if audio and a52 insert the headers
muxer_priv_t *priv = (muxer_priv_t *) muxer->priv;
muxer_headers_t *spriv = (muxer_headers_t *) s->priv;
- int pes_hlen = 0, len, stflen, stuffing_len, m, n, dvd_pack = 0, len2, target, hlen;
- uint64_t pts=0, dts=0;
+ int len, m, n, dvd_pack = 0;
mpeg_frame_t *frm;
pack_stats_t p;
Modified: trunk/libmpdemux/tvi_v4l2.c
==============================================================================
--- trunk/libmpdemux/tvi_v4l2.c (original)
+++ trunk/libmpdemux/tvi_v4l2.c Sat Jul 8 19:28:36 2006
@@ -1336,7 +1336,6 @@
priv_t *priv = (priv_t*)data;
long long skew, prev_skew, xskew, interval, prev_interval, delta;
int i;
- int err_count = 0;
int framesize = priv->format.fmt.pix.height*priv->format.fmt.pix.width*
pixfmt2depth(priv->format.fmt.pix.pixelformat)/8;
fd_set rdset;
Modified: trunk/m_option.c
==============================================================================
--- trunk/m_option.c (original)
+++ trunk/m_option.c Sat Jul 8 19:28:36 2006
@@ -1198,7 +1198,7 @@
static int get_obj_param(char* opt_name,char* obj_name, m_struct_t* desc,
char* str,int* nold,int oldmax,char** dst) {
- char* eq,param;
+ char* eq;
m_option_t* opt;
int r;
@@ -1252,7 +1252,7 @@
static int get_obj_params(char* opt_name, char* name,char* params,
m_struct_t* desc,char separator, char*** _ret) {
int n = 0,nold = 0, nopts,r;
- char* ptr,*last_ptr = params,*eq;
+ char* ptr,*last_ptr = params;
char** ret;
if(!strcmp(params,"help")) { // Help
More information about the MPlayer-cvslog
mailing list