diff --git a/libavcodec/arm/simple_idct_arm.S b/libavcodec/arm/simple_idct_arm.S
index 717b12c64be387beb7a59e2864bd4b0b5519433f..fce40b7d8cb03b584282bdb27e0a81eed93ca7e6 100644
--- a/libavcodec/arm/simple_idct_arm.S
+++ b/libavcodec/arm/simple_idct_arm.S
@@ -1,5 +1,4 @@
 /*
- * simple_idct_arm.S
  * Copyright (C) 2002 Frederic 'dilb' Boulay
  *
  * Author: Frederic Boulay <dilb@handhelds.org>
diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c
index 8d3448a67679748bd9abe83f51ffcac1aa55a2a6..b8dc407f7b10ab164a13a5f0e2dd8e32152f3382 100644
--- a/libavcodec/jfdctfst.c
+++ b/libavcodec/jfdctfst.c
@@ -1,6 +1,4 @@
 /*
- * jfdctfst.c
- *
  * This file is part of the Independent JPEG Group's software.
  *
  * The authors make NO WARRANTY or representation, either express or implied,
diff --git a/libavcodec/jfdctint_template.c b/libavcodec/jfdctint_template.c
index e60e72a412d3ca08ef6ef95862f64b46c5692b9f..02b6f093818fcae47b7f428a5d87dab28925a200 100644
--- a/libavcodec/jfdctint_template.c
+++ b/libavcodec/jfdctint_template.c
@@ -1,6 +1,4 @@
 /*
- * jfdctint.c
- *
  * This file is part of the Independent JPEG Group's software.
  *
  * The authors make NO WARRANTY or representation, either express or implied,
diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c
index 9e28daeae6d6d307dc1d05f57219b2394191d7f6..5ed96da2caa8ffab3fe4b29157c3e56f9362853d 100644
--- a/libavcodec/jrevdct.c
+++ b/libavcodec/jrevdct.c
@@ -1,6 +1,4 @@
 /*
- * jrevdct.c
- *
  * This file is part of the Independent JPEG Group's software.
  *
  * The authors make NO WARRANTY or representation, either express or implied,
diff --git a/libavcodec/libdirac.h b/libavcodec/libdirac.h
index e054f61a7813053b1493db5019942b4a949bb474..4403fb2a39ce8c7877088f98948b8cd3697aaf30 100644
--- a/libavcodec/libdirac.h
+++ b/libavcodec/libdirac.h
@@ -20,7 +20,7 @@
 
 /**
 * @file
-* data structures common to libdiracenc.c and libdiracdec.c
+* data structures common to libdirac encoder and decoder
 */
 
 #ifndef AVCODEC_LIBDIRAC_H
diff --git a/libavcodec/libschroedinger.c b/libavcodec/libschroedinger.c
index 1d31712d44641b2717c67652e9091cd97dd7d8ca..527c4927ae6c18181ccf97878176c6a1b28c87e1 100644
--- a/libavcodec/libschroedinger.c
+++ b/libavcodec/libschroedinger.c
@@ -20,7 +20,7 @@
 
 /**
 * @file
-* function definitions common to libschroedingerdec.c and libschroedingerenc.c
+* function definitions common to libschroedinger decoder and encoder
 */
 
 #include "libdirac_libschro.h"
diff --git a/libavcodec/libschroedinger.h b/libavcodec/libschroedinger.h
index c6ae5ea642849883382bf5f3a139e3b8132396a7..814782111b02c4639cda644d6485453470866d1d 100644
--- a/libavcodec/libschroedinger.h
+++ b/libavcodec/libschroedinger.h
@@ -20,7 +20,7 @@
 
 /**
 * @file
-* data structures common to libschroedingerdec.c and libschroedingerenc.c
+* data structures common to libschroedinger decoder and encoder
 */
 
 #ifndef AVCODEC_LIBSCHROEDINGER_H
diff --git a/libavcodec/x86/idct_mmx.c b/libavcodec/x86/idct_mmx.c
index 57fa81892d4efe0835231b6b31ae4111fef5cd6c..ed2d3217e55476a181119333975633c2cb65acf6 100644
--- a/libavcodec/x86/idct_mmx.c
+++ b/libavcodec/x86/idct_mmx.c
@@ -1,5 +1,4 @@
 /*
- * idct_mmx.c
  * Copyright (C) 1999-2001 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
  *
  * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.