--- ffmpeg/libavcodec/mpegaudiodec.c~	2010-07-27 06:08:34.000000000 -0400
+++ ffmpeg/libavcodec/mpegaudiodec.c	2012-01-09 11:36:43.224249000 -0500
@@ -2075,8 +2075,10 @@ 
         *data_size = out_size;
         avctx->sample_rate = s->sample_rate;
         //FIXME maybe move the other codec info stuff from above here too
-    }else
+    }else{
         av_log(avctx, AV_LOG_DEBUG, "Error while decoding MPEG audio frame.\n"); //FIXME return -1 / but also return the number of bytes consumed
+        *data_size = 0;
+    }
     s->frame_size = 0;
     return buf_size;
 }