@@ -26,9 +26,7 @@ FFTContext *av_fft_init(int nbits, int inverse)

 {

     FFTContext *s = av_malloc(sizeof(*s));

-    if (s)

-        ff_fft_init(s, nbits, inverse);

-    else

+    if (s && ff_fft_init(s, nbits, inverse))

         av_freep(&s);

     return s;

@@ -58,9 +56,7 @@ FFTContext *av_mdct_init(int nbits, int inverse, double scale)

 {

     FFTContext *s = av_malloc(sizeof(*s));

-    if (s)

-        ff_mdct_init(s, nbits, inverse, scale);

-    else

+    if (s && ff_mdct_init(s, nbits, inverse, scale))

         av_freep(&s);

     return s;

@@ -97,9 +93,7 @@ RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans)

 {

     RDFTContext *s = av_malloc(sizeof(*s));

-    if (s)

-        ff_rdft_init(s, nbits, trans);

-    else

+    if (s && ff_rdft_init(s, nbits, trans))

         av_freep(&s);

     return s;

@@ -126,9 +120,7 @@ DCTContext *av_dct_init(int nbits, enum DCTTransformType inverse)

 {

     DCTContext *s = av_malloc(sizeof(*s));

-    if (s)

-        ff_dct_init(s, nbits, inverse);

-    else

+    if (s && (ff_dct_init(s, nbits, inverse)))

         av_freep(&s);

     return s;