Replace ffmpeg references with more accurate libav* references.

diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index 99c43a09a4d1be698e8702f37c935f6f671c9314..8ae15eb67fbca949b87ac2225f87da18d47fcbfa 100644 (file)
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -36,7 +36,7 @@
  * a little more compression by exploiting the fact that adjacent pixels
  * tend to be similar.
  *
- * Note that this decoder could use ffmpeg's optimized VLC facilities
+ * Note that this decoder could use libavcodec's optimized VLC facilities
  * rather than naive, tree-based Huffman decoding. However, there are 256
  * Huffman tables. Plus, the VLC bit coding order is right -> left instead
  * or left -> right, so all of the bits would have to be reversed. Further,

diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index 86cc09ffa6298be500ddf497b2195b6fb7488a41..ecceceaa12432aa10a8ed2403480844e3cdd8518 100644 (file)
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -241,7 +241,7 @@ static av_cold int encode_init(AVCodecContext* avc_context)
         header, comment, and tables.
 
         Each one is prefixed with a 16bit size, then they
-        are concatenated together into ffmpeg's extradata.
+        are concatenated together into libavcodec's extradata.
     */
     offset = 0;
 

diff --git a/libavcodec/mace.c b/libavcodec/mace.c
index bf7c3319eb64f360f4600481d8159f7623bed3ed..5e870a2d2ef96bbe98d590c6967e8fc24f788f0a 100644 (file)
--- a/libavcodec/mace.c
+++ b/libavcodec/mace.c
@@ -27,7 +27,7 @@
 #include "avcodec.h"
 
 /*
- * Adapted to ffmpeg by Francois Revol <revol@free.fr>
+ * Adapted to libavcodec by Francois Revol <revol@free.fr>
  * (removed 68k REG stuff, changed types, added some statics and consts,
  * libavcodec api, context stuff, interlaced stereo out).
  */

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index cd7de73c98a1e9332e971d4fb9c4d4877c67a29f..2807d506ee9e09519773d3282354d3639ead71de 100644 (file)
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1854,7 +1854,7 @@ static int decode_user_data(MpegEncContext *s, GetBitContext *gb){
         }
     }
 
-    /* ffmpeg detection */
+    /* libavcodec detection */
     e=sscanf(buf, "FFmpe%*[^b]b%d", &build)+3;
     if(e!=4)
         e=sscanf(buf, "FFmpeg v%d.%d.%d / libavcodec build: %d", &ver, &ver2, &ver3, &build);

diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index 3fb3dc5b9512a9ab92ff71e89e56e6a5e900932d..7350ef2c4a481464ce0f8c74fbca41c98fc84c87 100644 (file)
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -30,8 +30,8 @@
  * Note that this decoder reads big endian RGB555 pixel values from the
  * bytestream, arranges them in the host's endian order, and outputs
  * them to the final rendered map in the same host endian order. This is
- * intended behavior as the ffmpeg documentation states that RGB555 pixels
- * shall be stored in native CPU endianness.
+ * intended behavior as the libavcodec documentation states that RGB555
+ * pixels shall be stored in native CPU endianness.
  */
 
 #include <stdio.h>

diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c
index e45bfd28e611395e130183f12b50ab09f49683ce..5a9fbc26480dd66f8566652dbddbfd3ff03353f5 100644 (file)
--- a/libavcodec/sparc/dsputil_vis.c
+++ b/libavcodec/sparc/dsputil_vis.c
@@ -19,7 +19,7 @@
  */
 
 /* The *no_round* functions have been added by James A. Morrison, 2003,2004.
-   The vis code from libmpeg2 was adapted for ffmpeg by James A. Morrison.
+   The vis code from libmpeg2 was adapted for libavcodec by James A. Morrison.
  */
 
 #include "config.h"

diff --git a/libavcodec/truemotion1data.h b/libavcodec/truemotion1data.h
index c94e3b5add10728180c0e726990fe18b1854349b..e950450fcdf26e7a708d2bce0297733398d2008e 100644 (file)
--- a/libavcodec/truemotion1data.h
+++ b/libavcodec/truemotion1data.h
@@ -2,9 +2,9 @@
  * Duck Truemotion v1 Decoding Tables
  *
  * Data in this file was originally part of VpVision from On2 which is
- * distributed under the GNU GPL. It is redistributed with ffmpeg under the
- * GNU LGPL using the common understanding that data tables necessary for
- * decoding algorithms are not necessarily licensable.
+ * distributed under the GNU GPL. It is redistributed with libavcodec under
+ * the GNU LGPL using the common understanding that data tables necessary
+ * for decoding algorithms are not necessarily copyrightable.
  *
  * This file is part of Libav.
  *

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index ed06e8a897f6bbbd948c2573da1221d394e1d99e..02453407b532eac94a8e31e32aec4df1b0e1970c 100644 (file)
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -362,7 +362,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
 
         /* Extract palette from extradata if bpp <= 8 */
         /* This code assumes that extradata contains only palette */
-        /* This is true for all paletted codecs implemented in ffmpeg */
+        /* This is true for all paletted codecs implemented in libavcodec */
         if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
             int av_unused i;
 #if HAVE_BIGENDIAN

diff --git a/libavformat/au.c b/libavformat/au.c
index 5121574c3ce6439a1b85f7393bdba2cc4c8f1abd..4f7677347b99da3064923d1117460f2d06cdd075 100644 (file)
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -35,7 +35,7 @@
 /* if we don't know the size in advance */
 #define AU_UNKNOWN_SIZE ((uint32_t)(~0))
 
-/* The ffmpeg codecs we support, and the IDs they have in the file */
+/* The libavcodec codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_au_tags[] = {
     { CODEC_ID_PCM_MULAW, 1 },
     { CODEC_ID_PCM_S8, 2 },

diff --git a/libavformat/cutils.c b/libavformat/cutils.c
index f94442f1bdef2d305c5083a6568f8746684f6a87..995524400e13c02be1bb276c9d8a5758b6b273ec 100644 (file)
--- a/libavformat/cutils.c
+++ b/libavformat/cutils.c
@@ -1,5 +1,5 @@
 /*
- * Various simple utilities for ffmpeg system
+ * various simple utilities for libavformat
  * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
  *
  * This file is part of Libav.

diff --git a/libavformat/dv.c b/libavformat/dv.c
index 2813bc3b678e2eb8d076f001b4c1db34f8e406d0..21823752f50a129cacd33ebe718dbfd66034a9e3 100644 (file)
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -96,7 +96,7 @@ static const uint8_t* dv_extract_pack(uint8_t* frame, enum dv_pack_type t)
 /*
  * There's a couple of assumptions being made here:
  * 1. By default we silence erroneous (0x8000/16bit 0x800/12bit) audio samples.
- *    We can pass them upwards when ffmpeg will be ready to deal with them.
+ *    We can pass them upwards when libavcodec will be ready to deal with them.
  * 2. We don't do software emphasis.
  * 3. Audio is always returned as 16bit linear samples: 12bit nonlinear samples
  *    are converted into 16bit linear ones.

diff --git a/libavformat/rso.h b/libavformat/rso.h
index bdb39e8d7fdd48df6a8a7f44ca7caf7250537492..e3e88ea6442b5e544c2f3b5a37d12aa14f9a7eb8 100644 (file)
--- a/libavformat/rso.h
+++ b/libavformat/rso.h
@@ -26,7 +26,7 @@
 
 #define RSO_HEADER_SIZE 8
 
-/* The ffmpeg codecs we support, and the IDs they have in the file */
+/* The libavcodec codecs we support, and the IDs they have in the file */
 extern const AVCodecTag ff_codec_rso_tags[];
 
 #endif /* AVFORMAT_RSO_H */