diff options
| -rw-r--r-- | libavcodec/idcinvideo.c | 2 | ||||
| -rw-r--r-- | libavcodec/libtheoraenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/mace.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 2 | ||||
| -rw-r--r-- | libavcodec/rpza.c | 4 | ||||
| -rw-r--r-- | libavcodec/sparc/dsputil_vis.c | 2 | ||||
| -rw-r--r-- | libavcodec/truemotion1data.h | 6 | ||||
| -rw-r--r-- | libavformat/asfdec.c | 2 | ||||
| -rw-r--r-- | libavformat/au.c | 2 | ||||
| -rw-r--r-- | libavformat/cutils.c | 2 | ||||
| -rw-r--r-- | libavformat/dv.c | 2 | ||||
| -rw-r--r-- | libavformat/rso.h | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index 99c43a09a4..8ae15eb67f 100644 --- 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 86cc09ffa6..ecceceaa12 100644 --- 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 bf7c3319eb..5e870a2d2e 100644 --- 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 cd7de73c98..2807d506ee 100644 --- 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 3fb3dc5b95..7350ef2c4a 100644 --- 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 e45bfd28e6..5a9fbc2648 100644 --- 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 c94e3b5add..e950450fcd 100644 --- 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 ed06e8a897..02453407b5 100644 --- 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 5121574c3c..4f7677347b 100644 --- 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 f94442f1bd..995524400e 100644 --- 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 2813bc3b67..21823752f5 100644 --- 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 bdb39e8d7f..e3e88ea644 100644 --- 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 */ |