diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-06-15 00:30:03 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-06-26 16:32:13 +0200 |
| commit | f3876ea4850dcb52c200cf7b8955dc6790626829 (patch) | |
| tree | d492fe98f0d18634eafecb4b5e1dbd9319f94b3b | |
| parent | d0ce090ec553c88eb8e9c303156017417d4599cc (diff) | |
| download | ffmpeg-f3876ea4850dcb52c200cf7b8955dc6790626829.tar.gz | |
Move some variable declarations below the proper #ifdefs.
This avoids warnings about set-but-unused variables.
| -rw-r--r-- | ffplay.c | 4 | ||||
| -rw-r--r-- | libavcodec/fft-test.c | 5 |
2 files changed, 5 insertions, 4 deletions
@@ -1313,9 +1313,10 @@ static void alloc_picture(void *opaque) static int queue_picture(VideoState *is, AVFrame *src_frame, double pts, int64_t pos) { VideoPicture *vp; - int dst_pix_fmt; #if CONFIG_AVFILTER AVPicture pict_src; +#else + int dst_pix_fmt = PIX_FMT_YUV420P; #endif /* wait until we have space to put a new picture */ 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 */ SDL_LockYUVOverlay (vp->bmp); - dst_pix_fmt = PIX_FMT_YUV420P; memset(&pict,0,sizeof(AVPicture)); pict.data[0] = vp->bmp->pixels[0]; pict.data[1] = vp->bmp->pixels[2]; diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index 0112c6fcbb..59a53ddeb6 100644 --- a/libavcodec/fft-test.c +++ b/libavcodec/fft-test.c @@ -252,8 +252,9 @@ int main(int argc, char **argv) #if CONFIG_FFT_FLOAT RDFTContext r1, *r = &r1; DCTContext d1, *d = &d1; + int fft_size_2; #endif - int fft_nbits, fft_size, fft_size_2; + int fft_nbits, fft_size; double scale = 1.0; AVLFG prng; av_lfg_init(&prng, 1); @@ -292,7 +293,6 @@ int main(int argc, char **argv) } fft_size = 1 << fft_nbits; - fft_size_2 = fft_size >> 1; tab = av_malloc(fft_size * sizeof(FFTComplex)); tab1 = 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; #if CONFIG_FFT_FLOAT case TRANSFORM_RDFT: + fft_size_2 = fft_size >> 1; if (do_inverse) { tab1[ 0].im = 0; tab1[fft_size_2].im = 0; |