Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h2
-rw-r--r--libavformat/avidec.c2
-rw-r--r--libavformat/mpegtsenc.c2
-rw-r--r--libavformat/mxfenc.c2
-rw-r--r--libavformat/oggparsespeex.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 77114e62e6..55808f13b8 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -742,7 +742,7 @@ typedef struct AVFormatContext {
/**
* Decoding: total stream bitrate in bit/s, 0 if not
* available. Never set it directly if the file_size and the
- * duration are known as FFmpeg can compute it automatically.
+ * duration are known as Libav can compute it automatically.
*/
int bit_rate;
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index c7bbf422b7..43d72ce400 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -588,7 +588,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* 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 Libav. */
if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
#if HAVE_BIGENDIAN
for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 35db93be40..2ffbd542fa 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -181,7 +181,7 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id,
/*********************************************/
/* mpegts writer */
-#define DEFAULT_PROVIDER_NAME "FFmpeg"
+#define DEFAULT_PROVIDER_NAME "Libav"
#define DEFAULT_SERVICE_NAME "Service01"
/* a PES packet header is generated every DEFAULT_PES_HEADER_FREQ packets */
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 44052a0610..c448e14b00 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -499,7 +499,7 @@ static void mxf_write_identification(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
AVIOContext *pb = s->pb;
- const char *company = "FFmpeg";
+ const char *company = "Libav";
const char *product = "OP1a Muxer";
const char *version;
int length;
diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index 80b2001ddf..2f4aec7f07 100644
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -59,7 +59,7 @@ static int speex_header(AVFormatContext *s, int idx) {
st->codec->channels = AV_RL32(p + 48);
/* We treat the whole Speex packet as a single frame everywhere Speex
- is handled in FFmpeg. This avoids the complexities of splitting
+ is handled in Libav. This avoids the complexities of splitting
and joining individual Speex frames, which are not always
byte-aligned. */
st->codec->frame_size = AV_RL32(p + 56);