diff --git a/cws2fws.c b/cws2fws.c
index ef40f31592..1f9b1604f7 100644
--- a/cws2fws.c
+++ b/cws2fws.c
@@ -3,7 +3,6 @@
  * Public domain.
  *
  * This utility converts compressed Macromedia Flash files to uncompressed ones.
- *
  */
 
 #include <sys/stat.h>
diff --git a/ffmpeg.c b/ffmpeg.c
index 6905f2c2b8..35d7b9df9b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3720,7 +3720,7 @@ static void show_license(void)
     "\n"
     "You should have received a copy of the GNU General Public License\n"
     "along with FFmpeg; if not, write to the Free Software\n"
-    "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
+    "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
     );
 #else
     printf(
diff --git a/ffserver.c b/ffserver.c
index 2c7065ba54..71118aebb6 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4475,7 +4475,7 @@ static void show_license(void)
     "\n"
     "You should have received a copy of the GNU Lesser General Public\n"
     "License along with FFmpeg; if not, write to the Free Software\n"
-    "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
+    "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
     );
 }
 
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index e914a0d962..64f515971f 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/allcodecs.h b/libavcodec/allcodecs.h
index 89d8b78369..3e18ca0d41 100644
--- a/libavcodec/allcodecs.h
+++ b/libavcodec/allcodecs.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef ALLCODECS_H
diff --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c
index 3371ed7ce5..e1535a5300 100644
--- a/libavcodec/armv4l/mpegvideo_arm.c
+++ b/libavcodec/armv4l/mpegvideo_arm.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #include "dsputil.h"
diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c
index cab743f9d1..4c021219f0 100644
--- a/libavcodec/audioconvert.c
+++ b/libavcodec/audioconvert.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index acb7445478..a18d67e068 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef AVCODEC_H
diff --git a/libavcodec/avs.c b/libavcodec/avs.c
index ebfa8adb74..b4bba76060 100644
--- a/libavcodec/avs.c
+++ b/libavcodec/avs.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avcodec.h"
diff --git a/libavcodec/beosthread.c b/libavcodec/beosthread.c
index 2a56955b36..4c99bc0ff5 100644
--- a/libavcodec/beosthread.c
+++ b/libavcodec/beosthread.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 //#define DEBUG
 
diff --git a/libavcodec/c93.c b/libavcodec/c93.c
index e2e3a5109a..c6a48668a1 100644
--- a/libavcodec/c93.c
+++ b/libavcodec/c93.c
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avcodec.h"
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index c6da6292a2..2d51f6bcf0 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index ea4d062edd..e27bcbc46a 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c
index c5f48480ad..452e57ccc2 100644
--- a/libavcodec/cavs.c
+++ b/libavcodec/cavs.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h
index a259b7a055..fcdaef2b2b 100644
--- a/libavcodec/cavs.h
+++ b/libavcodec/cavs.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef CAVS_H
diff --git a/libavcodec/cavs_parser.c b/libavcodec/cavs_parser.c
index 11146efbfb..33f7fff710 100644
--- a/libavcodec/cavs_parser.c
+++ b/libavcodec/cavs_parser.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h
index 21cc45823c..6cbe1ec1c5 100644
--- a/libavcodec/cavsdata.h
+++ b/libavcodec/cavsdata.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef AVCODEC_CAVSDATA_H
diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c
index 55ecaae0a0..fd744cc808 100644
--- a/libavcodec/cavsdsp.c
+++ b/libavcodec/cavsdsp.c
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index c67bea5c26..b1399f997f 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 44810f5cff..e028d5cfd6 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 72645d35f2..2d4a72ed55 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/cookdata.h b/libavcodec/cookdata.h
index 5d18010a0a..751a5a4cdd 100644
--- a/libavcodec/cookdata.h
+++ b/libavcodec/cookdata.h
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index b4b6f9379a..eaff1ee11a 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/eval.c b/libavcodec/eval.c
index 877de35529..b82c7b415f 100644
--- a/libavcodec/eval.c
+++ b/libavcodec/eval.c
@@ -19,7 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/faandct.h b/libavcodec/faandct.h
index b859bd2159..a1c27bbe56 100644
--- a/libavcodec/faandct.h
+++ b/libavcodec/faandct.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/fdctref.c b/libavcodec/fdctref.c
index 5eff368491..c6a057b846 100644
--- a/libavcodec/fdctref.c
+++ b/libavcodec/fdctref.c
@@ -27,7 +27,6 @@
  * are subject to royalty fees to patent holders.  Many of these patents are
  * general enough such that they are unavoidable regardless of implementation
  * design.
- *
  */
 
 #include <math.h>
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index ee5419cd3f..4a8d80b672 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index e88b12d5c5..e57688fe41 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index 71a4219dee..a15f602a57 100644
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/golomb.c b/libavcodec/golomb.c
index 50df4fc400..1c90db3d11 100644
--- a/libavcodec/golomb.c
+++ b/libavcodec/golomb.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index be2d34b75b..ab92c6efd4 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index cab28415b5..8826e0b0e7 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 1669e8ece9..237a222bec 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 4adb6cbe22..7a85d770cf 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/h264_parser.h b/libavcodec/h264_parser.h
index 1d7407e4f5..40b5500c56 100644
--- a/libavcodec/h264_parser.h
+++ b/libavcodec/h264_parser.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index ea0f23ac26..8ade1df232 100644
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/h264idct.c b/libavcodec/h264idct.c
index a6a56d33a7..571e2e91d1 100644
--- a/libavcodec/h264idct.c
+++ b/libavcodec/h264idct.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/i386/cavsdsp_mmx.c b/libavcodec/i386/cavsdsp_mmx.c
index 30bab38c02..6230533144 100644
--- a/libavcodec/i386/cavsdsp_mmx.c
+++ b/libavcodec/i386/cavsdsp_mmx.c
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "dsputil.h"
diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index 354a884443..eeb538c4f0 100644
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 6140130b1c..1540b50014 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -19,7 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h
index 29c6b81a1b..fcd780b420 100644
--- a/libavcodec/imcdata.h
+++ b/libavcodec/imcdata.h
@@ -19,7 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #ifndef AVCODEC_IMCDATA_H
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index be9a93a5bb..9935854b74 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index bce3a9a430..23532f42af 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c
index c56b62ca2f..ccff678fa4 100644
--- a/libavcodec/kmvc.c
+++ b/libavcodec/kmvc.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/lcl.c b/libavcodec/lcl.c
index 0a60489414..f3dbf13c17 100644
--- a/libavcodec/lcl.c
+++ b/libavcodec/lcl.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index ced0b8d280..c3d848f314 100644
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*!
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index b11e3d8af2..5d40e91b52 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index 8b261cabc6..355e955aad 100644
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 82ea02dac7..d1b9cb04e7 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index 3acad4b660..70b4f824a2 100644
--- a/libavcodec/motion_est_template.c
+++ b/libavcodec/motion_est_template.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c
index 34ded32e47..25d0e2ee7f 100644
--- a/libavcodec/mpc.c
+++ b/libavcodec/mpc.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/mpcdata.h b/libavcodec/mpcdata.h
index 61dfa0d383..e40f7e5e23 100644
--- a/libavcodec/mpcdata.h
+++ b/libavcodec/mpcdata.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #ifndef AVCODEC_MPCDATA_H
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 2e8a4e959b..2106498bae 100644
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 97b593cb2f..deddfd1cd9 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/os2thread.c b/libavcodec/os2thread.c
index 03df9117db..5c74a7d658 100644
--- a/libavcodec/os2thread.c
+++ b/libavcodec/os2thread.c
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 //#define DEBUG
 
diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c
index c4e0cfd0a2..e1299be1bd 100644
--- a/libavcodec/ppc/idct_altivec.c
+++ b/libavcodec/ppc/idct_altivec.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /*
diff --git a/libavcodec/ppc/snow_altivec.c b/libavcodec/ppc/snow_altivec.c
index 66ab86553a..815b3097de 100644
--- a/libavcodec/ppc/snow_altivec.c
+++ b/libavcodec/ppc/snow_altivec.c
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- *
  */
 
 #include "dsputil.h"
diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c
index dc6883cbe3..99f72e1f04 100644
--- a/libavcodec/ppc/vc1dsp_altivec.c
+++ b/libavcodec/ppc/vc1dsp_altivec.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #include "dsputil.h"
diff --git a/libavcodec/ps2/idct_mmi.c b/libavcodec/ps2/idct_mmi.c
index 6aaf8b355a..2ba2ad02d2 100644
--- a/libavcodec/ps2/idct_mmi.c
+++ b/libavcodec/ps2/idct_mmi.c
@@ -23,8 +23,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
-*/
+ */
 
 #include "common.h"
 #include "dsputil.h"
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index d82753b9c8..00febde426 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -20,7 +20,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 #include <pthread.h>
 
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c
index 897e7ec6b2..1fcb2fcd7b 100644
--- a/libavcodec/ptx.c
+++ b/libavcodec/ptx.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #include "avcodec.h"
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 55b0dc06c0..79b976fb0b 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -20,7 +20,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/qdm2data.h b/libavcodec/qdm2data.h
index 410ec468f6..cfadd87f68 100644
--- a/libavcodec/qdm2data.h
+++ b/libavcodec/qdm2data.h
@@ -20,7 +20,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
  /**
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index 93d582e06f..cc4d07da1a 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c
index 44391d185a..a12a48eede 100644
--- a/libavcodec/qpeg.c
+++ b/libavcodec/qpeg.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index 002dfcb345..06ea48ed63 100644
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c
index eaa1b3dbbe..581a55b69a 100644
--- a/libavcodec/qtrleenc.c
+++ b/libavcodec/qtrleenc.c
@@ -19,7 +19,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #include "avcodec.h"
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c
index 0842dd9ce7..face38fddc 100644
--- a/libavcodec/rangecoder.c
+++ b/libavcodec/rangecoder.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index 298928ad43..f26b39aa7f 100644
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index c03c38c5c2..ffd6fc71c6 100644
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/rle.c b/libavcodec/rle.c
index 828a0c21de..2fb0d0e486 100644
--- a/libavcodec/rle.c
+++ b/libavcodec/rle.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 #include "avcodec.h"
 #include "rle.h"
diff --git a/libavcodec/rle.h b/libavcodec/rle.h
index edee8e130e..15252c85d0 100644
--- a/libavcodec/rle.h
+++ b/libavcodec/rle.h
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #ifndef RLE_H
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index 32da3fd919..d75131b142 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index df79a23c86..22b184e372 100644
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/s3tc.h b/libavcodec/s3tc.h
index 55615f4aa4..d368c5b805 100644
--- a/libavcodec/s3tc.h
+++ b/libavcodec/s3tc.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #ifndef FF_S3TC_H
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 3bdb5f25fd..fa1bdf6c8b 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index 0875fd59b3..78f130cf3a 100644
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index f08bb85f72..b463bc809d 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -16,8 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- *
+ */
+
+/*
  * How to use this decoder:
  * SVQ3 data is transported within Apple Quicktime files. Quicktime files
  * have stsd atoms to describe media trak properties. A stsd atom for a
@@ -37,7 +38,6 @@
  * You will know you have these parameters passed correctly when the decoder
  * correctly decodes this file:
  *  ftp://ftp.mplayerhq.hu/MPlayer/samples/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
- *
  */
 
 /**
diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index d637bedae5..e595dfa62b 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 #include "avcodec.h"
 
diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c
index 8852d0d638..47e33b19e1 100644
--- a/libavcodec/targaenc.c
+++ b/libavcodec/targaenc.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 #include "avcodec.h"
 #include "rle.h"
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index f614b32a6a..fca45898de 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h
index 09ba3fd9db..594fcc5d0c 100644
--- a/libavcodec/tiff.h
+++ b/libavcodec/tiff.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 72353c0bc1..5b567aeec6 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index 2217665061..494dfd55fc 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index fae3fa3dab..40013ae9a7 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 82713fb0ff..1ab207961e 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c
index c2439c4d16..5b1f4aaaf0 100644
--- a/libavcodec/ulti.c
+++ b/libavcodec/ulti.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 3fe0d272c3..d56eefcc93 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c
index 6102c09601..dfcb49c226 100644
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 5b8b8cf99b..c37e8fd48b 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index d432782d9e..bee31956d7 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index f80c62b09f..0be5976a67 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #undef V_DEBUG
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index e82833ddf6..290423c847 100644
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbis_dec.c
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #undef V_DEBUG
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index 0c59c766c3..3912022118 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/libavcodec/vorbis_enc_data.h b/libavcodec/vorbis_enc_data.h
index dcdaa58b01..8875d77e67 100644
--- a/libavcodec/vorbis_enc_data.h
+++ b/libavcodec/vorbis_enc_data.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef AVCODEC_VORBIS_ENC_DATA_H
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 7975a21076..593e7a4c84 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 95eb775091..39b289c69d 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdlib.h>
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index abd1b3a63f..e3634c8261 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avcodec.h"
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index 023f3b9c23..624363e9f7 100644
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef VP56_H
diff --git a/libavcodec/vp56data.c b/libavcodec/vp56data.c
index e75c6d1cec..6ef3abb36a 100644
--- a/libavcodec/vp56data.c
+++ b/libavcodec/vp56data.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "vp56data.h"
diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h
index d784b9803a..51e6983119 100644
--- a/libavcodec/vp56data.h
+++ b/libavcodec/vp56data.h
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef VP56DATA_H
diff --git a/libavcodec/vp5data.h b/libavcodec/vp5data.h
index 1474873bde..0f3754cce0 100644
--- a/libavcodec/vp5data.h
+++ b/libavcodec/vp5data.h
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef VP5DATA_H
diff --git a/libavcodec/vp6data.h b/libavcodec/vp6data.h
index 0545a9d667..083c3fd482 100644
--- a/libavcodec/vp6data.h
+++ b/libavcodec/vp6data.h
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef VP6DATA_H
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index b13865dfe1..dbd4550189 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/w32thread.c b/libavcodec/w32thread.c
index 63ffe53bd6..12c9212945 100644
--- a/libavcodec/w32thread.c
+++ b/libavcodec/w32thread.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 //#define DEBUG
 
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index 35eab80020..2eab7421f8 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index fa427b524d..0aadf4dbed 100644
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 32402a7114..8a128146c6 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/xl.c b/libavcodec/xl.c
index 8a011d8875..e7dd7923fb 100644
--- a/libavcodec/xl.c
+++ b/libavcodec/xl.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index fd71145092..d0b2f3afa7 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c
index 86ea1cb768..ce62ece4d2 100644
--- a/libavcodec/zmbvenc.c
+++ b/libavcodec/zmbvenc.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavformat/avs.c b/libavformat/avs.c
index 5325ff6610..79a2ed8237 100644
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avformat.h"
diff --git a/libavformat/c93.c b/libavformat/c93.c
index 636f3e0de7..369ae8e01e 100644
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "avformat.h"
diff --git a/libavformat/dv1394.h b/libavformat/dv1394.h
index f7db401085..5f9465054b 100644
--- a/libavformat/dv1394.h
+++ b/libavformat/dv1394.h
@@ -23,7 +23,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #ifndef _DV_1394_H
diff --git a/libavformat/mm.c b/libavformat/mm.c
index 304d3188ec..a2c8a0c10f 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index 5e75f16334..0c73b4e082 100644
--- a/libavformat/mpc.c
+++ b/libavformat/mpc.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
 #include "bitstream.h"
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 323d549ac1..8ef65c8069 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #ifndef AVFORMAT_NUT_H
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index fab672043f..72d3ea0fa8 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #include "tree.h"
diff --git a/libavformat/tta.c b/libavformat/tta.c
index b4b3522696..b6b79a0f55 100644
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
 #include "bitstream.h"
diff --git a/libavformat/voc.c b/libavformat/voc.c
index 97b73d1639..750f78d15f 100644
--- a/libavformat/voc.c
+++ b/libavformat/voc.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "voc.h"
diff --git a/libavformat/voc.h b/libavformat/voc.h
index 9b2bb8cce1..e98ca39911 100644
--- a/libavformat/voc.h
+++ b/libavformat/voc.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef VOC_H
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 8ed4fcbdf4..c33bfbd321 100644
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "voc.h"
diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c
index 6a07c92dd3..7ef96bfede 100644
--- a/libavformat/vocenc.c
+++ b/libavformat/vocenc.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "voc.h"
diff --git a/libavformat/x11grab.c b/libavformat/x11grab.c
index 8916d799a6..65e313982b 100644
--- a/libavformat/x11grab.c
+++ b/libavformat/x11grab.c
@@ -24,9 +24,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU General Public License
+ * along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/libavutil/adler32.c b/libavutil/adler32.c
index 50d57470b0..369cdaf6d4 100644
--- a/libavutil/adler32.c
+++ b/libavutil/adler32.c
@@ -18,7 +18,6 @@
  * 2. Altered source versions must be plainly marked as such, and must not be
  *    misrepresented as being the original software.
  * 3. This notice may not be removed or altered from any source distribution.
- *
  */
 
 #include "common.h"
diff --git a/libavutil/integer.c b/libavutil/integer.c
index 3269a366a4..d4f5f2b51b 100644
--- a/libavutil/integer.c
+++ b/libavutil/integer.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavutil/integer.h b/libavutil/integer.h
index 2a6f8b0279..2a1df34bc3 100644
--- a/libavutil/integer.h
+++ b/libavutil/integer.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavutil/lls.c b/libavutil/lls.c
index aa9467dcee..1d209f364f 100644
--- a/libavutil/lls.c
+++ b/libavutil/lls.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
diff --git a/libavutil/lls.h b/libavutil/lls.h
index 59ad2e958d..e6d352a9ef 100644
--- a/libavutil/lls.h
+++ b/libavutil/lls.h
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef LLS_H
diff --git a/libavutil/rational.c b/libavutil/rational.c
index ac0c9d3714..96a4c5462e 100644
--- a/libavutil/rational.c
+++ b/libavutil/rational.c
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavutil/rational.h b/libavutil/rational.h
index 8aaba667aa..b00e3a4745 100644
--- a/libavutil/rational.h
+++ b/libavutil/rational.h
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
index b6e5485745..a0d614bbd6 100644
--- a/libavutil/softfloat.h
+++ b/libavutil/softfloat.h
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #ifndef AVUTIL_SOFTFLOAT_H
diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index d966896782..ae16ab2d00 100644
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 /**
  * @file postprocess_template.c