1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Move some variable declarations below the proper #ifdefs.

This avoids warnings about set-but-unused variables.
This commit is contained in:
Diego Biurrun 2011-06-15 00:30:03 +02:00
parent d0ce090ec5
commit f3876ea485
2 changed files with 5 additions and 4 deletions

View File

@ -1313,9 +1313,10 @@ static void alloc_picture(void *opaque)
static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t pos) static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t pos)
{ {
VideoPicture *vp; VideoPicture *vp;
int dst_pix_fmt;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
AVPicture pict_src; AVPicture pict_src;
#else
int dst_pix_fmt = PIX_FMT_YUV420P;
#endif #endif
/* wait until we have space to put a new picture */ /* wait until we have space to put a new picture */
SDL_LockMutex(is->pictq_mutex); SDL_LockMutex(is->pictq_mutex);
@ -1376,7 +1377,6 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t
/* get a pointer on the bitmap */ /* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp); SDL_LockYUVOverlay (vp->bmp);
dst_pix_fmt = PIX_FMT_YUV420P;
memset(&pict,0,sizeof(AVPicture)); memset(&pict,0,sizeof(AVPicture));
pict.data[0] = vp->bmp->pixels[0]; pict.data[0] = vp->bmp->pixels[0];
pict.data[1] = vp->bmp->pixels[2]; pict.data[1] = vp->bmp->pixels[2];

View File

@ -252,8 +252,9 @@ int main(int argc, char **argv)
#if CONFIG_FFT_FLOAT #if CONFIG_FFT_FLOAT
RDFTContext r1, *r = &r1; RDFTContext r1, *r = &r1;
DCTContext d1, *d = &d1; DCTContext d1, *d = &d1;
int fft_size_2;
#endif #endif
int fft_nbits, fft_size, fft_size_2; int fft_nbits, fft_size;
double scale = 1.0; double scale = 1.0;
AVLFG prng; AVLFG prng;
av_lfg_init(&prng, 1); av_lfg_init(&prng, 1);
@ -292,7 +293,6 @@ int main(int argc, char **argv)
} }
fft_size = 1 << fft_nbits; fft_size = 1 << fft_nbits;
fft_size_2 = fft_size >> 1;
tab = av_malloc(fft_size * sizeof(FFTComplex)); tab = av_malloc(fft_size * sizeof(FFTComplex));
tab1 = av_malloc(fft_size * sizeof(FFTComplex)); tab1 = av_malloc(fft_size * sizeof(FFTComplex));
tab_ref = av_malloc(fft_size * sizeof(FFTComplex)); tab_ref = av_malloc(fft_size * sizeof(FFTComplex));
@ -372,6 +372,7 @@ int main(int argc, char **argv)
break; break;
#if CONFIG_FFT_FLOAT #if CONFIG_FFT_FLOAT
case TRANSFORM_RDFT: case TRANSFORM_RDFT:
fft_size_2 = fft_size >> 1;
if (do_inverse) { if (do_inverse) {
tab1[ 0].im = 0; tab1[ 0].im = 0;
tab1[fft_size_2].im = 0; tab1[fft_size_2].im = 0;