Replace more FFmpeg instances by Libav or ffmpeg.

SaschaVasarrhelyi · Apr 23, 2011 · 43fb279 · 43fb279
1 parent 6252040
commit 43fb279
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/doc/general.texi b/doc/general.texi
@@ -268,7 +268,7 @@ library:
 
 @section Image Formats
 
-FFmpeg can read and write images for each frame of a video sequence. The
+Libav can read and write images for each frame of a video sequence. The
 following image formats are supported:
 
 @multitable @columnfractions .4 .1 .1 .4

diff --git a/doc/issue_tracker.txt b/doc/issue_tracker.txt
@@ -39,7 +39,7 @@ NOTE: issue = (bug report || patch || feature request)
 Type:
 -----
 bug
-    An error, flaw, mistake, failure, or fault in FFmpeg or libav* that
+    An error, flaw, mistake, failure, or fault in ffmpeg or libav* that
     prevents it from behaving as intended.
 
 feature request

diff --git a/ffserver.c b/ffserver.c
@@ -2265,7 +2265,7 @@ static int http_prepare_data(HTTPContext *c)
 
         /*
          * HACK to avoid mpeg ps muxer to spit many underflow errors
-         * Default value from FFmpeg
+         * Default value from Libav
          * Try to set it use configuration option
          */
         c->fmt_ctx.preload   = (int)(0.5*AV_TIME_BASE);

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
@@ -960,7 +960,7 @@ typedef struct AVPanScan{
     int64_t reordered_opaque;\
 \
     /**\
-     * hardware accelerator private data (FFmpeg allocated)\
+     * hardware accelerator private data (Libav-allocated)\
      * - encoding: unused\
      * - decoding: Set by libavcodec\
      */\
@@ -2633,8 +2633,8 @@ typedef struct AVCodecContext {
      * Hardware accelerator context.
      * For some hardware accelerators, a global context needs to be
      * provided by the user. In that case, this holds display-dependent
-     * data FFmpeg cannot instantiate itself. Please refer to the
-     * FFmpeg HW accelerator documentation to know how to fill this
+     * data Libav cannot instantiate itself. Please refer to the
+     * Libav HW accelerator documentation to know how to fill this
      * is. e.g. for VA API, this is a struct vaapi_context.
      * - encoding: unused
      * - decoding: Set by user

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
@@ -1798,7 +1798,7 @@ static int dca_decode_frame(AVCodecContext * avctx,
 
 
     /* There is nothing that prevents a dts frame to change channel configuration
-       but FFmpeg doesn't support that so only set the channels if it is previously
+       but Libav doesn't support that so only set the channels if it is previously
        unset. Ideally during the first probe for channels the crc should be checked
        and only set avctx->channels when the crc is ok. Right now the decoder could
        set the channels based on a broken first frame.*/