[FFmpeg-cvslog] avformat/http,tls: honor http_proxy command line variable for HTTPS

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Sun Aug 23 
13:53:39 2020 +0200| [94b63e8ae8deb218339d93a3ec0732826dba7a54] | committer: 
Marton Balint

avformat/http,tls: honor http_proxy command line variable for HTTPS

Add the "http_proxy" option and its handling to the "tls" protocol,
pass the option from the "https" protocol.

The "https" protocol already defines the "http_proxy" command line
option, like the "http" protocol does. The "http" protocol properly
honors that command line option in addition to the environment
variable. The "https" protocol doesn't, because the proxy is
evaluated in the underlying "tls" protocol, which doesn't have this
option, and thus only handles the environment variable, which it
has access to.

Fixes #7223.

Signed-off-by: Moritz Barsnick 
Signed-off-by: Marton Balint 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94b63e8ae8deb218339d93a3ec0732826dba7a54
---

 doc/protocols.texi | 4 
 libavformat/http.c | 6 ++
 libavformat/tls.c  | 2 +-
 libavformat/tls.h  | 4 +++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 3644fe3dd6..78afe6ec8e 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -1772,6 +1772,10 @@ A file containing the private key for the certificate.
 If enabled, listen for connections on the provided port, and assume
 the server role in the handshake instead of the client role.
 
+@item http_proxy
+The HTTP proxy to tunnel through, e.g. @code{http://example.com:1234}.
+The proxy must support the CONNECT method.
+
 @end table
 
 Example command lines:
diff --git a/libavformat/http.c b/libavformat/http.c
index d44bc64f7b..fb2d9306bd 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -214,6 +214,12 @@ static int http_open_cnx_internal(URLContext *h, 
AVDictionary **options)
 use_proxy   = 0;
 if (port < 0)
 port = 443;
+/* pass http_proxy to underlying protocol */
+if (s->http_proxy) {
+err = av_dict_set(options, "http_proxy", s->http_proxy, 0);
+if (err < 0)
+return err;
+}
 }
 if (port < 0)
 port = 80;
diff --git a/libavformat/tls.c b/libavformat/tls.c
index 10e0792e29..302c0f8d59 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -89,7 +89,7 @@ int ff_tls_open_underlying(TLSShared *c, URLContext *parent, 
const char *uri, AV
 if (!c->host && !(c->host = av_strdup(c->underlying_host)))
 return AVERROR(ENOMEM);
 
-proxy_path = getenv("http_proxy");
+proxy_path = c->http_proxy ? c->http_proxy : getenv("http_proxy");
 use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), 
c->underlying_host) &&
 proxy_path && av_strstart(proxy_path, "http://;, NULL);
 
diff --git a/libavformat/tls.h b/libavformat/tls.h
index beb19d6d55..6c6aa01a9a 100644
--- a/libavformat/tls.h
+++ b/libavformat/tls.h
@@ -34,6 +34,7 @@ typedef struct TLSShared {
 int listen;
 
 char *host;
+char *http_proxy;
 
 char underlying_host[200];
 int numerichost;
@@ -49,7 +50,8 @@ typedef struct TLSShared {
 {"cert_file",  "Certificate file",offsetof(pstruct, 
options_field . cert_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
 {"key_file",   "Private key file",offsetof(pstruct, 
options_field . key_file),  AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
 {"listen", "Listen for incoming connections", offsetof(pstruct, 
options_field . listen),AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = 
TLS_OPTFL }, \
-{"verifyhost", "Verify against a specific hostname",  offsetof(pstruct, 
options_field . host),  AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }
+{"verifyhost", "Verify against a specific hostname",  offsetof(pstruct, 
options_field . host),  AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
+{"http_proxy", "Set proxy to tunnel through", offsetof(pstruct, 
options_field . http_proxy), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }
 
 int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, 
AVDictionary **options);
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avdevice/xcbgrab: check return values of xcb query functions

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Wed Aug  5 
14:06:53 2020 +0200| [2250dc40443a2b1e54a8fbcaae9402fcaa1538dd] | committer: 
Andriy Gelman

avdevice/xcbgrab: check return values of xcb query functions

Fixes #7312, segmentation fault on close of X11 server

xcb_query_pointer_reply() and xcb_get_geometry_reply() can return NULL
if e.g. the X server closes or the connection is lost. This needs to
be checked in order to cleanly exit, because the returned pointers are
dereferenced later.

Signed-off-by: Moritz Barsnick 
Reviewed-by: Andriy Gelman 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2250dc40443a2b1e54a8fbcaae9402fcaa1538dd
---

 libavdevice/xcbgrab.c | 9 +
 1 file changed, 9 insertions(+)

diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c
index 6f6b2dbf15..8ef2a30d02 100644
--- a/libavdevice/xcbgrab.c
+++ b/libavdevice/xcbgrab.c
@@ -425,7 +425,16 @@ static int xcbgrab_read_packet(AVFormatContext *s, 
AVPacket *pkt)
 pc  = xcb_query_pointer(c->conn, c->screen->root);
 gc  = xcb_get_geometry(c->conn, c->screen->root);
 p   = xcb_query_pointer_reply(c->conn, pc, NULL);
+if (!p) {
+av_log(s, AV_LOG_ERROR, "Failed to query xcb pointer\n");
+return AVERROR_EXTERNAL;
+}
 geo = xcb_get_geometry_reply(c->conn, gc, NULL);
+if (!geo) {
+av_log(s, AV_LOG_ERROR, "Failed to get xcb geometry\n");
+free(p);
+return AVERROR_EXTERNAL;
+}
 }
 
 if (c->follow_mouse && p->same_screen)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mov: fix missing line break in messages

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Thu Jun 25 
12:40:45 2020 +0200| [2dabee7c0faef202ed04e20856e9f58cb4415810] | committer: 
Gyan Doshi

avformat/mov: fix missing line break in messages

One of them can be triggered by https://samples.ffmpeg.org/F4V/H263_NM_f.mp4.

Signed-off-by: Moritz Barsnick 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2dabee7c0faef202ed04e20856e9f58cb4415810
---

 libavformat/mov.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index da438e4e2c..7f8413c6c9 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -894,7 +894,7 @@ static int mov_read_ddts(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 (frame_duration_code == 3) ? 4096 : 0;
 
 if (channel_layout_code > 0xff) {
-av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel layout");
+av_log(c->fc, AV_LOG_WARNING, "Unsupported DTS audio channel 
layout\n");
 }
 st->codecpar->channel_layout =
 ((channel_layout_code & 0x1) ? AV_CH_FRONT_CENTER : 0) |
@@ -5219,7 +5219,7 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 } else {
 edit_count = atom.size / elst_entry_size;
 if (edit_count * elst_entry_size != atom.size) {
-av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, 
bigger than %d entries.", atom.size, edit_count);
+av_log(c->fc, AV_LOG_WARNING, "ELST atom of %"PRId64" bytes, 
bigger than %d entries.\n", atom.size, edit_count);
 }
 }
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] doc/ffmpeg: remove reference to deprecated option

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Mon Jun  8 
17:09:53 2020 +0200| [aab0885c198432457ff43581394156d9b09c05d1] | committer: 
Gyan Doshi

doc/ffmpeg: remove reference to deprecated option

The "-deinterlace" was deprecated since d7edd35, over eight years
ago.

Refer to deinterlacing filters instead.

Signed-off-by: Moritz Barsnick 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aab0885c198432457ff43581394156d9b09c05d1
---

 doc/ffmpeg.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 76fafdcf7e..92fb10f4f4 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -848,8 +848,8 @@ factor if negative.
 Force interlacing support in encoder (MPEG-2 and MPEG-4 only).
 Use this option if your input file is interlaced and you want
 to keep the interlaced format for minimum losses.
-The alternative is to deinterlace the input stream with
-@option{-deinterlace}, but deinterlacing introduces losses.
+The alternative is to deinterlace the input stream by use of a filter
+such as @code{yadif} or @code{bwdif}, but deinterlacing introduces losses.
 @item -psnr
 Calculate PSNR of compressed frames.
 @item -vstats

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] doc/utils: document the "s", "ms" and "us" suffixes for durations

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Mon Jun  8 
17:39:00 2020 +0200| [7ab375f57488112fcdc8c286cdf74276d50887c2] | committer: 
Gyan Doshi

doc/utils: document the "s", "ms" and "us" suffixes for durations

These suffixes were introduced in 61c972384d311508d07f9360d196909e27195655
and completed in 8218249f1f04de65904f58519bde21948e5a0783.

Signed-off-by: Moritz Barsnick 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ab375f57488112fcdc8c286cdf74276d50887c2
---

 doc/utils.texi | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/utils.texi b/doc/utils.texi
index e7a9b40b35..44ce285d26 100644
--- a/doc/utils.texi
+++ b/doc/utils.texi
@@ -110,11 +110,13 @@ maximum of 2 digits. The @var{m} at the end expresses 
decimal value for
 @emph{or}
 
 @example
-[-]@var{S}+[.@var{m}...]
+[-]@var{S}+[.@var{m}...][s|ms|us]
 @end example
 
 @var{S} expresses the number of seconds, with the optional decimal part
-@var{m}.
+@var{m}.  The optional literal suffixes @samp{s}, @samp{ms} or @samp{us}
+indicate to interpret the value as seconds, milliseconds or microseconds,
+respectively.
 
 In both expressions, the optional @samp{-} indicates negative duration.
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mpjpegdec: fix strict boundary search string

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Mon Oct  7 
00:19:29 2019 +0200| [1ea44a55fe36c92420cba3542de256a1507f52fe] | committer: 
Michael Niedermayer

avformat/mpjpegdec: fix strict boundary search string

According to RFC1341, the multipart boundary indicated by the
Content-Type header must be prepended by CRLF + "--", and followed
by CRLF. In the case of strict MIME header boundary handling, the
"--" was forgotten to add.

Fixes trac #7921.

A side effect is that this coincidentally breaks enforcement of
strict MIME headers against servers running motion < 3.4.1, where
the boundary announcement in the HTTP headers incorrectly used the
prefix "--", which exactly matched this bug's behavior.

Signed-off-by: Moritz Barsnick 
Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ea44a55fe36c92420cba3542de256a1507f52fe
---

 libavformat/mpjpegdec.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index c0ffaf616e..24bf232db2 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -302,8 +302,9 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket 
*pkt)
 boundary = mpjpeg_get_boundary(s->pb);
 }
 if (boundary != NULL) {
-mpjpeg->boundary = boundary;
-mpjpeg->searchstr = av_asprintf( "\r\n%s\r\n", boundary );
+mpjpeg->boundary = av_asprintf("--%s", boundary);
+mpjpeg->searchstr = av_asprintf("\r\n--%s\r\n", boundary);
+av_freep();
 } else {
 mpjpeg->boundary = av_strdup("--");
 mpjpeg->searchstr = av_strdup("\r\n--");

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mpjpegdec: fix finding multipart boundary parameter

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Mon Oct  7 
00:19:28 2019 +0200| [a3846fe69bbd71341155c33ece14b0591264caa8] | committer: 
Michael Niedermayer

avformat/mpjpegdec: fix finding multipart boundary parameter

The string matching function's return value was evaluated incorrectly.

Fixes trac #7920.

Signed-off-by: Moritz Barsnick 
Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3846fe69bbd71341155c33ece14b0591264caa8
---

 libavformat/mpjpegdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index 84130ab718..c0ffaf616e 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -267,7 +267,7 @@ static char* mpjpeg_get_boundary(AVIOContext* pb)
 while (av_isspace(*start))
 start++;
 
-if (!av_stristart(start, "boundary=", )) {
+if (av_stristart(start, "boundary=", )) {
 end = strchr(start, ';');
 if (end)
 len = end - start - 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/mpjpegdec: ensure seekback for latest chunk

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Mon Oct  7 
00:19:30 2019 +0200| [f76a899abc80512959ec7deab25bc9642c4feb73] | committer: 
Michael Niedermayer

avformat/mpjpegdec: ensure seekback for latest chunk

Not only the first, but each latest chunk must be cached to allow
seekback after finding the mime boundary.

Fixes trac #5023 and #5921.

Signed-off-by: Moritz Barsnick 
Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f76a899abc80512959ec7deab25bc9642c4feb73
---

 libavformat/mpjpegdec.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c
index 24bf232db2..c79a39c69d 100644
--- a/libavformat/mpjpegdec.c
+++ b/libavformat/mpjpegdec.c
@@ -336,10 +336,8 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket 
*pkt)
 pkt->size = 0;
 pkt->pos  = avio_tell(s->pb);
 
-/* we may need to return as much as all we've read back to the buffer 
*/
-ffio_ensure_seekback(s->pb, read_chunk);
-
-while ((ret = av_append_packet(s->pb, pkt, read_chunk - remaining)) >= 
0) {
+while ((ret = ffio_ensure_seekback(s->pb, read_chunk - remaining)) >= 
0 && /* we may need to return as much as all we've read back to the buffer */
+   (ret = av_append_packet(s->pb, pkt, read_chunk - remaining)) >= 
0) {
 /* scan the new data */
 char *start;
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/hashenc: fix incorrect use of av_mallocz_array()

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Sun Sep 22 
14:24:11 2019 +0200| [e9e9f79a1908899a315eed760e55b2c32ec1e55b] | committer: 
Michael Niedermayer

avformat/hashenc: fix incorrect use of av_mallocz_array()

Fixes CID 1453867, CID 1453866, CID 1453865.

Signed-off-by: Moritz Barsnick 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9e9f79a1908899a315eed760e55b2c32ec1e55b
---

 libavformat/hashenc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c
index 8e090731ae..34a8fd1f50 100644
--- a/libavformat/hashenc.c
+++ b/libavformat/hashenc.c
@@ -85,7 +85,7 @@ static int hash_init(struct AVFormatContext *s)
 int res;
 struct HashContext *c = s->priv_data;
 c->per_stream = 0;
-c->hashes = av_mallocz_array(1, sizeof(c->hashes));
+c->hashes = av_mallocz_array(1, sizeof(*c->hashes));
 if (!c->hashes)
 return AVERROR(ENOMEM);
 res = av_hash_alloc(>hashes[0], c->hash_name);
@@ -102,7 +102,7 @@ static int streamhash_init(struct AVFormatContext *s)
 int res, i;
 struct HashContext *c = s->priv_data;
 c->per_stream = 1;
-c->hashes = av_mallocz_array(s->nb_streams, sizeof(c->hashes));
+c->hashes = av_mallocz_array(s->nb_streams, sizeof(*c->hashes));
 if (!c->hashes)
 return AVERROR(ENOMEM);
 for (i = 0; i < s->nb_streams; i++) {
@@ -270,7 +270,7 @@ static int framehash_init(struct AVFormatContext *s)
 int res;
 struct HashContext *c = s->priv_data;
 c->per_stream = 0;
-c->hashes = av_mallocz_array(1, sizeof(c->hashes));
+c->hashes = av_mallocz_array(1, sizeof(*c->hashes));
 if (!c->hashes)
 return AVERROR(ENOMEM);
 res = av_hash_alloc(>hashes[0], c->hash_name);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/hashenc: rearrange options definition

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Thu Sep 12 
11:23:04 2019 +0200| [d214f216110f3af9be3b6af2ed5ca285ffe3bda3] | committer: 
Michael Niedermayer

avformat/hashenc: rearrange options definition

Only the frame* muxers support the format_version option.
Use macros to ease the proliferation of identical options to
coming muxers as well.

Signed-off-by: Moritz Barsnick 
Reviewed-by: James Almer 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d214f216110f3af9be3b6af2ed5ca285ffe3bda3
---

 libavformat/hashenc.c | 35 +++
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c
index 06fc085d18..210bfdea0e 100644
--- a/libavformat/hashenc.c
+++ b/libavformat/hashenc.c
@@ -36,18 +36,37 @@ struct HashContext {
 
 #define OFFSET(x) offsetof(struct HashContext, x)
 #define ENC AV_OPT_FLAG_ENCODING_PARAM
-#if CONFIG_HASH_MUXER || CONFIG_FRAMEHASH_MUXER
+#define HASH_OPT(defaulttype) \
+{ "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str 
= defaulttype}, 0, 0, ENC }
+#define FORMAT_VERSION_OPT \
+{ "format_version", "file format version", OFFSET(format_version), 
AV_OPT_TYPE_INT, {.i64 = 2}, 1, 2, ENC }
+
+#if CONFIG_HASH_MUXER
 static const AVOption hash_options[] = {
-{ "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str 
= "sha256"}, 0, 0, ENC },
-{ "format_version", "file format version", OFFSET(format_version), 
AV_OPT_TYPE_INT, {.i64 = 2}, 1, 2, ENC },
+HASH_OPT("sha256"),
+{ NULL },
+};
+#endif
+
+#if CONFIG_FRAMEHASH_MUXER
+static const AVOption framehash_options[] = {
+HASH_OPT("sha256"),
+FORMAT_VERSION_OPT,
 { NULL },
 };
 #endif
 
-#if CONFIG_MD5_MUXER || CONFIG_FRAMEMD5_MUXER
+#if CONFIG_MD5_MUXER
 static const AVOption md5_options[] = {
-{ "hash", "set hash to use", OFFSET(hash_name), AV_OPT_TYPE_STRING, {.str 
= "md5"}, 0, 0, ENC },
-{ "format_version", "file format version", OFFSET(format_version), 
AV_OPT_TYPE_INT, {.i64 = 2}, 1, 2, ENC },
+HASH_OPT("md5"),
+{ NULL },
+};
+#endif
+
+#if CONFIG_FRAMEMD5_MUXER
+static const AVOption framemd5_options[] = {
+HASH_OPT("md5"),
+FORMAT_VERSION_OPT,
 { NULL },
 };
 #endif
@@ -219,7 +238,7 @@ static int framehash_write_trailer(struct AVFormatContext 
*s)
 static const AVClass framehash_class = {
 .class_name = "frame hash muxer",
 .item_name  = av_default_item_name,
-.option = hash_options,
+.option = framehash_options,
 .version= LIBAVUTIL_VERSION_INT,
 };
 
@@ -242,7 +261,7 @@ AVOutputFormat ff_framehash_muxer = {
 static const AVClass framemd5_class = {
 .class_name = "frame MD5 muxer",
 .item_name  = av_default_item_name,
-.option = md5_options,
+.option = framemd5_options,
 .version= LIBAVUTIL_VERSION_INT,
 };
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/rtpenc_mpegts: copy metadata to mpegts sub-muxer

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Mon Jul  2 
13:38:04 2018 +0200| [270f94e132b623bd6717515b3a72c5f1c535190b] | committer: 
Michael Niedermayer

avformat/rtpenc_mpegts: copy metadata to mpegts sub-muxer

Fixes #7293.

Signed-off-by: Moritz Barsnick 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=270f94e132b623bd6717515b3a72c5f1c535190b
---

 libavformat/rtpenc_mpegts.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c
index 969dbff3d6..45ba6fffe5 100644
--- a/libavformat/rtpenc_mpegts.c
+++ b/libavformat/rtpenc_mpegts.c
@@ -60,6 +60,7 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
 return AVERROR(ENOMEM);
 mpegts_ctx->oformat   = mpegts_format;
 mpegts_ctx->max_delay = s->max_delay;
+av_dict_copy(_ctx->metadata, s->metadata, 0);
 for (i = 0; i < s->nb_streams; i++) {
 AVStream* st = avformat_new_stream(mpegts_ctx, NULL);
 if (!st)
@@ -102,6 +103,7 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
 fail:
 if (mpegts_ctx) {
 ffio_free_dyn_buf(_ctx->pb);
+av_dict_free(_ctx->metadata);
 avformat_free_context(mpegts_ctx);
 }
 if (rtp_ctx)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avformat/hashenc: use an array of hashes

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Thu Sep 12 
11:23:05 2019 +0200| [666b4278811f401a23186b9bc709c3d085f19e80] | committer: 
Michael Niedermayer

avformat/hashenc: use an array of hashes

Only the first element of the array is used currently, the other
elements are in preparation for a new muxer calculating multiple
hashes.

Also move alloc/init code from the write_header() functions to
dedicated init() functions, and the cleanup code from the
write_trailer() functions to dedicated deinit() functions.

hash_free() and framehash_free() turn out to be identical here,
but will differ in the subsequent commit, so they are not consolidated.

Signed-off-by: Moritz Barsnick 
Reviewed-by: James Almer 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=666b4278811f401a23186b9bc709c3d085f19e80
---

 libavformat/hashenc.c | 82 +--
 1 file changed, 54 insertions(+), 28 deletions(-)

diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c
index 210bfdea0e..a9be6d0c81 100644
--- a/libavformat/hashenc.c
+++ b/libavformat/hashenc.c
@@ -29,7 +29,7 @@
 
 struct HashContext {
 const AVClass *avclass;
-struct AVHashContext *hash;
+struct AVHashContext **hashes;
 char *hash_name;
 int format_version;
 };
@@ -72,20 +72,24 @@ static const AVOption framemd5_options[] = {
 #endif
 
 #if CONFIG_HASH_MUXER || CONFIG_MD5_MUXER
-static int hash_write_header(struct AVFormatContext *s)
+static int hash_init(struct AVFormatContext *s)
 {
+int res;
 struct HashContext *c = s->priv_data;
-int res = av_hash_alloc(>hash, c->hash_name);
+c->hashes = av_mallocz_array(1, sizeof(c->hashes));
+if (!c->hashes)
+return AVERROR(ENOMEM);
+res = av_hash_alloc(>hashes[0], c->hash_name);
 if (res < 0)
 return res;
-av_hash_init(c->hash);
+av_hash_init(c->hashes[0]);
 return 0;
 }
 
 static int hash_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 {
 struct HashContext *c = s->priv_data;
-av_hash_update(c->hash, pkt->data, pkt->size);
+av_hash_update(c->hashes[0], pkt->data, pkt->size);
 return 0;
 }
 
@@ -93,16 +97,23 @@ static int hash_write_trailer(struct AVFormatContext *s)
 {
 struct HashContext *c = s->priv_data;
 char buf[AV_HASH_MAX_SIZE*2+128];
-snprintf(buf, sizeof(buf) - 200, "%s=", av_hash_get_name(c->hash));
+snprintf(buf, sizeof(buf) - 200, "%s=", av_hash_get_name(c->hashes[0]));
 
-av_hash_final_hex(c->hash, buf + strlen(buf), sizeof(buf) - strlen(buf));
+av_hash_final_hex(c->hashes[0], buf + strlen(buf), sizeof(buf) - 
strlen(buf));
 av_strlcatf(buf, sizeof(buf), "\n");
 avio_write(s->pb, buf, strlen(buf));
 avio_flush(s->pb);
 
-av_hash_freep(>hash);
 return 0;
 }
+
+static void hash_free(struct AVFormatContext *s)
+{
+struct HashContext *c = s->priv_data;
+if (c->hashes)
+av_hash_freep(>hashes[0]);
+av_freep(>hashes);
+}
 #endif
 
 #if CONFIG_HASH_MUXER
@@ -119,9 +130,10 @@ AVOutputFormat ff_hash_muxer = {
 .priv_data_size= sizeof(struct HashContext),
 .audio_codec   = AV_CODEC_ID_PCM_S16LE,
 .video_codec   = AV_CODEC_ID_RAWVIDEO,
-.write_header  = hash_write_header,
+.init  = hash_init,
 .write_packet  = hash_write_packet,
 .write_trailer = hash_write_trailer,
+.deinit= hash_free,
 .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
  AVFMT_TS_NEGATIVE,
 .priv_class= _class,
@@ -142,9 +154,10 @@ AVOutputFormat ff_md5_muxer = {
 .priv_data_size= sizeof(struct HashContext),
 .audio_codec   = AV_CODEC_ID_PCM_S16LE,
 .video_codec   = AV_CODEC_ID_RAWVIDEO,
-.write_header  = hash_write_header,
+.init  = hash_init,
 .write_packet  = hash_write_packet,
 .write_trailer = hash_write_trailer,
+.deinit= hash_free,
 .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT |
  AVFMT_TS_NEGATIVE,
 .priv_class= _class,
@@ -164,24 +177,34 @@ static void framehash_print_extradata(struct 
AVFormatContext *s)
 char buf[AV_HASH_MAX_SIZE*2+1];
 
 avio_printf(s->pb, "#extradata %d, %31d, ", i, 
par->extradata_size);
-av_hash_init(c->hash);
-av_hash_update(c->hash, par->extradata, par->extradata_size);
-av_hash_final_hex(c->hash, buf, sizeof(buf));
+av_hash_init(c->hashes[0]);
+av_hash_update(c->hashes[0], par->extradata, par->extradata_size);
+av_hash_final_hex(c->hashes[0], buf, sizeof(buf));
 avio_write(s->pb, buf, strlen(buf));
 avio_printf(s->pb,

[FFmpeg-cvslog] avformat/hashenc: add streamhash muxer

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Thu Sep 12 
11:23:06 2019 +0200| [2f87c9f646f36763be186e53186b813f821494c1] | committer: 
Michael Niedermayer

avformat/hashenc: add streamhash muxer

Implemented as a variant of the hash muxer, reusing most functions,
and making use of the previously introduced array of hashes.

Signed-off-by: Moritz Barsnick 
Reviewed-by: James Almer 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f87c9f646f36763be186e53186b813f821494c1
---

 Changelog|   1 +
 doc/muxers.texi  |  47 ++
 libavformat/Makefile |   1 +
 libavformat/allformats.c |   1 +
 libavformat/hashenc.c| 100 ++-
 libavformat/version.h|   4 +-
 6 files changed, 142 insertions(+), 12 deletions(-)

diff --git a/Changelog b/Changelog
index 08b7464cb1..db4024b9e6 100644
--- a/Changelog
+++ b/Changelog
@@ -10,6 +10,7 @@ version :
 - IMM5 video decoder
 - ZeroMQ protocol
 - support Sipro ACELP.KELVIN decoding
+- streamhash muxer
 
 
 version 4.2:
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 0adb93ba55..b3da8bf12e 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -2064,6 +2064,53 @@ Specify whether to remove all fragments when finished. 
Default 0 (do not remove)
 
 @end table
 
+@anchor{streamhash}
+@section streamhash
+
+Per stream hash testing format.
+
+This muxer computes and prints a cryptographic hash of all the input frames,
+on a per-stream basis. This can be used for equality checks without having
+to do a complete binary comparison.
+
+By default audio frames are converted to signed 16-bit raw audio and
+video frames to raw video before computing the hash, but the output
+of explicit conversions to other codecs can also be used. Timestamps
+are ignored. It uses the SHA-256 cryptographic hash function by default,
+but supports several other algorithms.
+
+The output of the muxer consists of one line per stream of the form:
+@var{streamindex},@var{streamtype},@var{algo}=@var{hash}, where
+@var{streamindex} is the index of the mapped stream, @var{streamtype} is a
+single characer indicating the type of stream, @var{algo} is a short string
+representing the hash function used, and @var{hash} is a hexadecimal number
+representing the computed hash.
+
+@table @option
+@item hash @var{algorithm}
+Use the cryptographic hash function specified by the string @var{algorithm}.
+Supported values include @code{MD5}, @code{murmur3}, @code{RIPEMD128},
+@code{RIPEMD160}, @code{RIPEMD256}, @code{RIPEMD320}, @code{SHA160},
+@code{SHA224}, @code{SHA256} (default), @code{SHA512/224}, @code{SHA512/256},
+@code{SHA384}, @code{SHA512}, @code{CRC32} and @code{adler32}.
+
+@end table
+
+@subsection Examples
+
+To compute the SHA-256 hash of the input converted to raw audio and
+video, and store it in the file @file{out.sha256}:
+@example
+ffmpeg -i INPUT -f streamhash out.sha256
+@end example
+
+To print an MD5 hash to stdout use the command:
+@example
+ffmpeg -i INPUT -f streamhash -hash md5 -
+@end example
+
+See also the @ref{hash} and @ref{framehash} muxers.
+
 @anchor{fifo}
 @section fifo
 
diff --git a/libavformat/Makefile b/libavformat/Makefile
index efa3a112ae..a61d42b721 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -494,6 +494,7 @@ OBJS-$(CONFIG_SRT_DEMUXER)   += srtdec.o 
subtitles.o
 OBJS-$(CONFIG_SRT_MUXER) += srtenc.o
 OBJS-$(CONFIG_STL_DEMUXER)   += stldec.o subtitles.o
 OBJS-$(CONFIG_STR_DEMUXER)   += psxstr.o
+OBJS-$(CONFIG_STREAMHASH_MUXER)  += hashenc.o
 OBJS-$(CONFIG_STREAM_SEGMENT_MUXER)  += segment.o
 OBJS-$(CONFIG_SUBVIEWER1_DEMUXER)+= subviewer1dec.o subtitles.o
 OBJS-$(CONFIG_SUBVIEWER_DEMUXER) += subviewerdec.o subtitles.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index cd00834807..f7fea32b45 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -393,6 +393,7 @@ extern AVInputFormat  ff_srt_demuxer;
 extern AVOutputFormat ff_srt_muxer;
 extern AVInputFormat  ff_str_demuxer;
 extern AVInputFormat  ff_stl_demuxer;
+extern AVOutputFormat ff_streamhash_muxer;
 extern AVInputFormat  ff_subviewer1_demuxer;
 extern AVInputFormat  ff_subviewer_demuxer;
 extern AVInputFormat  ff_sup_demuxer;
diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c
index a9be6d0c81..8e090731ae 100644
--- a/libavformat/hashenc.c
+++ b/libavformat/hashenc.c
@@ -31,6 +31,7 @@ struct HashContext {
 const AVClass *avclass;
 struct AVHashContext **hashes;
 char *hash_name;
+int per_stream;
 int format_version;
 };
 
@@ -56,6 +57,13 @@ static const AVOption framehash_options[] = {
 };
 #endif
 
+#if CONFIG_STREAMHASH_MUXER
+static const AVOption streamhash_options[] = {
+HASH_OPT("sha256"),
+{ NULL },
+};
+#endif
+
 #if CONFIG_MD5_MUXER
 static const AVOption md5_options[] = {
 HASH_OPT("md5

[FFmpeg-cvslog] avformat/aiffdec: parse replaygain metadata

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Wed Mar 13 
10:17:40 2019 +0100| [6390f52ac79932ed53a96619aa9cf2efd0a0fd19] | committer: 
Michael Niedermayer

avformat/aiffdec: parse replaygain metadata

Signed-off-by: Moritz Barsnick 
Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6390f52ac79932ed53a96619aa9cf2efd0a0fd19
---

 libavformat/aiffdec.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index fcedb0a804..61ef099f26 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -29,6 +29,7 @@
 #include "isom.h"
 #include "id3v2.h"
 #include "mov_chan.h"
+#include "replaygain.h"
 
 #define AIFF0
 #define AIFF_C_VERSION1 0xA2805140
@@ -348,6 +349,10 @@ static int aiff_read_header(AVFormatContext *s)
 }
 }
 
+ret = ff_replaygain_export(st, s->metadata);
+if (ret < 0)
+return ret;
+
 got_sound:
 if (!st->codecpar->block_align && st->codecpar->codec_id == 
AV_CODEC_ID_QCELP) {
 av_log(s, AV_LOG_WARNING, "qcelp without wave chunk, assuming full 
rate\n");

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] doc: various spelling, grammar and formatting fixes

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Tue Sep 17 
10:21:02 2019 +0200| [53d31e91c5302131cf0631c053d04f09b36897ee] | committer: 
Gyan Doshi

doc: various spelling, grammar and formatting fixes

Signed-off-by: Moritz Barsnick 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53d31e91c5302131cf0631c053d04f09b36897ee
---

 doc/filters.texi | 69 
 doc/muxers.texi  |  4 ++--
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 469473..06ce7ec069 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -756,7 +756,7 @@ aecho=0.8:0.88:60:0.4
 @end example
 
 @item
-If delay is very short, then it sound like a (metallic) robot playing music:
+If delay is very short, then it sounds like a (metallic) robot playing music:
 @example
 aecho=0.8:0.88:6:0.4
 @end example
@@ -1157,11 +1157,11 @@ It can be used as component for digital crossover 
filters,
 room equalization, cross talk cancellation, wavefield synthesis,
 auralization, ambiophonics, ambisonics and spatialization.
 
-This filter uses second stream as FIR coefficients.
-If second stream holds single channel, it will be used
-for all input channels in first stream, otherwise
-number of channels in second stream must be same as
-number of channels in first stream.
+This filter uses the second stream as FIR coefficients.
+If the second stream holds a single channel, it will be used
+for all input channels in the first stream, otherwise
+the number of channels in the second stream must be same as
+the number of channels in the first stream.
 
 It accepts the following parameters:
 
@@ -1766,7 +1766,7 @@ Each sample is adjusted by looking for other samples with 
similar contexts. This
 context similarity is defined by comparing their surrounding patches of size
 @option{p}. Patches are searched in an area of @option{r} around the sample.
 
-The filter accepts the following options.
+The filter accepts the following options:
 
 @table @option
 @item s
@@ -2965,12 +2965,12 @@ Compensation Delay Line is a metric based delay to 
compensate differing
 positions of microphones or speakers.
 
 For example, you have recorded guitar with two microphones placed in
-different location. Because the front of sound wave has fixed speed in
+different locations. Because the front of sound wave has fixed speed in
 normal conditions, the phasing of microphones can vary and depends on
 their location and interposition. The best sound mix can be achieved when
-these microphones are in phase (synchronized). Note that distance of
-~30 cm between microphones makes one microphone to capture signal in
-antiphase to another microphone. That makes the final mix sounding moody.
+these microphones are in phase (synchronized). Note that a distance of
+~30 cm between microphones makes one microphone capture the signal in
+antiphase to the other microphone. That makes the final mix sound moody.
 This filter helps to solve phasing problems by adding different delays
 to each microphone track and make them synchronized.
 
@@ -2979,7 +2979,7 @@ synchronize other tracks one by one with it.
 Remember that synchronization/delay tolerance depends on sample rate, too.
 Higher sample rates will give more tolerance.
 
-It accepts the following parameters:
+The filter accepts the following parameters:
 
 @table @option
 @item mm
@@ -3003,7 +3003,7 @@ Set wet amount. Amount of processed (wet) signal.
 Default is 1.
 
 @item temp
-Set temperature degree in Celsius. This is the temperature of the environment.
+Set temperature in degrees Celsius. This is the temperature of the environment.
 Default is 20.
 @end table
 
@@ -6638,7 +6638,7 @@ If the interlacing is unknown or the decoder does not 
export this information,
 top field first will be assumed.
 
 @item deint
-Specify which frames to deinterlace. Accept one of the following
+Specify which frames to deinterlace. Accepts one of the following
 values:
 
 @table @option
@@ -11423,7 +11423,7 @@ All streams must be of same pixel format and of same 
height.
 Note that this filter is faster than using @ref{overlay} and @ref{pad} filter
 to create same output.
 
-The filter accept the following option:
+The filter accepts the following option:
 
 @table @option
 @item inputs
@@ -13262,7 +13262,7 @@ the following values: "blur", "blur_no_scale", 
"median", "gaussian",
 or "bilateral". The default value is "gaussian".
 
 The meaning of @var{param1}, @var{param2}, @var{param3}, and @var{param4}
-depend on the smooth type. @var{param1} and
+depends on the smooth type. @var{param1} and
 @var{param2} accept integer positive values or 0. @var{param3} and
 @var{param4} accept floating point values.
 
@@ -14443,7 +14443,7 @@ __kernel void blend_images(__write_only image2d_t dst,
 
 Alter frame colors in video with pseudocolors.
 
-This filter accept the following options:
+This

[FFmpeg-cvslog] avfilter/f_realtime: add option to scale speed

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Wed May  1 
16:12:59 2019 +0200| [98541f70320bc42be277f0fadf74639c190bb827] | committer: 
Paul B Mahol

avfilter/f_realtime: add option to scale speed

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98541f70320bc42be277f0fadf74639c190bb827
---

 doc/filters.texi | 8 
 libavfilter/f_realtime.c | 7 +--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index cd82869849..2f9333c3f3 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -21136,6 +21136,14 @@ They accept the following options:
 @item limit
 Time limit for the pauses. Any pause longer than that will be considered
 a timestamp discontinuity and reset the timer. Default is 2 seconds.
+@item speed
+Speed factor for processing. The value must be a float larger than zero.
+Values larger than 1.0 will result in faster than realtime processing,
+smaller will slow processing down. The @var{limit} is automatically adapted
+accordingly. Default is 1.0.
+
+A processing speed faster than what is possible without these filters cannot
+be achieved.
 @end table
 
 @anchor{select}
diff --git a/libavfilter/f_realtime.c b/libavfilter/f_realtime.c
index 171c16..6fd3559dac 100644
--- a/libavfilter/f_realtime.c
+++ b/libavfilter/f_realtime.c
@@ -22,11 +22,13 @@
 #include "libavutil/time.h"
 #include "avfilter.h"
 #include "internal.h"
+#include 
 
 typedef struct RealtimeContext {
 const AVClass *class;
 int64_t delta;
 int64_t limit;
+double speed;
 unsigned inited;
 } RealtimeContext;
 
@@ -36,7 +38,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 RealtimeContext *s = ctx->priv;
 
 if (frame->pts != AV_NOPTS_VALUE) {
-int64_t pts = av_rescale_q(frame->pts, inlink->time_base, 
AV_TIME_BASE_Q);
+int64_t pts = av_rescale_q(frame->pts, inlink->time_base, 
AV_TIME_BASE_Q) / s->speed;
 int64_t now = av_gettime_relative();
 int64_t sleep = pts - now + s->delta;
 if (!s->inited) {
@@ -44,7 +46,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 sleep = 0;
 s->delta = now - pts;
 }
-if (sleep > s->limit || sleep < -s->limit) {
+if (FFABS(sleep) > s->limit / s->speed) {
 av_log(ctx, AV_LOG_WARNING,
"time discontinuity detected: %"PRIi64" us, resetting\n",
sleep);
@@ -65,6 +67,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | 
AV_OPT_FLAG_FILTERING_PARAM
 static const AVOption options[] = {
 { "limit", "sleep time limit", OFFSET(limit), AV_OPT_TYPE_DURATION, { .i64 
= 200 }, 0, INT64_MAX, FLAGS },
+{ "speed", "speed factor", OFFSET(speed), AV_OPT_TYPE_DOUBLE, { .dbl = 1.0 
}, DBL_MIN, DBL_MAX, FLAGS },
 { NULL }
 };
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] configure: fix dependencies for mlp and truehd encoders

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Tue Feb 12 
17:51:26 2019 +0100| [a84af760b809c4a2a6bc33c2f88f82dd9d1952bc] | committer: 
Carl Eugen Hoyos

configure: fix dependencies for mlp and truehd encoders

Signed-off-by: Moritz Barsnick 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a84af760b809c4a2a6bc33c2f88f82dd9d1952bc
---

 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index ac2d7ab402..bf40c1dcb9 100755
--- a/configure
+++ b/configure
@@ -2699,7 +2699,7 @@ mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp 
jpegtables"
 mjpeg_encoder_select="jpegtables mpegvideoenc"
 mjpegb_decoder_select="mjpeg_decoder"
 mlp_decoder_select="mlp_parser"
-mlp_encoder_select="lpc"
+mlp_encoder_select="lpc audio_frame_queue"
 motionpixels_decoder_select="bswapdsp"
 mp1_decoder_select="mpegaudio"
 mp1float_decoder_select="mpegaudio"
@@ -2781,7 +2781,7 @@ thp_decoder_select="mjpeg_decoder"
 tiff_decoder_suggest="zlib lzma"
 tiff_encoder_suggest="zlib"
 truehd_decoder_select="mlp_parser"
-truehd_encoder_select="lpc"
+truehd_encoder_select="lpc audio_frame_queue"
 truemotion2_decoder_select="bswapdsp"
 truespeech_decoder_select="bswapdsp"
 tscc_decoder_deps="zlib"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc: fix various typos

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Sun Feb 10 
12:10:20 2019 +0100| [885a80d189698633e7c94bb55fdb1dac12871483] | committer: 
Gyan Doshi

doc: fix various typos

Found with the help of codespell-1.14.0.

Signed-off-by: Moritz Barsnick 
Signed-off-by: Gyan Doshi 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=885a80d189698633e7c94bb55fdb1dac12871483
---

 doc/bitstream_filters.texi |  2 +-
 doc/codecs.texi|  2 +-
 doc/filters.texi   | 16 
 doc/formats.texi   |  2 +-
 doc/general.texi   |  8 
 doc/muxers.texi|  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi
index b779265f58..076b910e40 100644
--- a/doc/bitstream_filters.texi
+++ b/doc/bitstream_filters.texi
@@ -561,7 +561,7 @@ P3 D65
 @end table
 
 @item transfer_characteristics
-Set the color transfert.
+Set the color transfer.
 Available values are:
 
 @table @samp
diff --git a/doc/codecs.texi b/doc/codecs.texi
index 02d5a1b222..572e561c1a 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -1230,7 +1230,7 @@ instead of alpha. Default is 0.
 @item dump_separator @var{string} (@emph{input})
 Separator used to separate the fields printed on the command line about the
 Stream parameters.
-For example to separate the fields with newlines and indention:
+For example, to separate the fields with newlines and indentation:
 @example
 ffprobe -dump_separator "
   "  -i ~/videos/matrixbench_mpeg2.mpg
diff --git a/doc/filters.texi b/doc/filters.texi
index ac6f6f0082..0ef6f56d5d 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -606,7 +606,7 @@ The lower value, the more samples will be detected as 
impulsive noise.
 Set burst fusion, in percentage of window size. Allowed range is @code{0} to
 @code{10}. Default value is @code{2}.
 If any two samples detected as noise are spaced less than this value then any
-sample in between those two samples will be also detected as noise.
+sample between those two samples will be also detected as noise.
 
 @item m
 Set overlap method.
@@ -1399,7 +1399,7 @@ single-precision floating-point
 @end table
 
 @item response
-Show IR frequency reponse, magnitude and phase in additional video stream.
+Show IR frequency response, magnitude and phase in additional video stream.
 By default it is disabled.
 
 @item channel
@@ -1425,7 +1425,7 @@ used for all remaining channels.
 
 @itemize
 @item
-Apply 2 pole elliptic notch at arround 5000Hz for 48000 Hz sample rate:
+Apply 2 pole elliptic notch at around 5000Hz for 48000 Hz sample rate:
 @example
 aiir=k=1:z=7.957584807809675810E-1 -2.575128568908332300 3.674839853930788710 
-2.57512875289799137 7.957586296317130880E-1:p=1 -2.86950072432325953 
3.63022088054647218 -2.28075678147272232 6.361362326477423500E-1:f=tf:r=d
 @end example
@@ -5648,7 +5648,7 @@ For example radius of 3 will instruct filter to calculate 
average of 7 frames.
 Set factor to amplify difference. Default is 2. Allowed range is from 0 to 
65535.
 
 @item threshold
-Set threshold for difference amplification. Any differrence greater or equal to
+Set threshold for difference amplification. Any difference greater or equal to
 this value will not alter source pixel. Default is 10.
 Allowed range is from 0 to 65535.
 
@@ -6033,7 +6033,7 @@ The filter accepts the following options.
 @item sigma
 Set denoising strength. Default value is 1.
 Allowed range is from 0 to 999.9.
-The denoising algorith is very sensitive to sigma, so adjust it
+The denoising algorithm is very sensitive to sigma, so adjust it
 according to the source.
 
 @item block
@@ -10265,7 +10265,7 @@ The filter accepts the following options:
 Set horizontal sigma, standard deviation of Gaussian blur. Default is 
@code{0.5}.
 
 @item steps
-Set number of steps for Gaussian approximation. Defauls is @code{1}.
+Set number of steps for Gaussian approximation. Default is @code{1}.
 
 @item planes
 Set which planes to filter. By default all planes are filtered.
@@ -15336,7 +15336,7 @@ Keep the same color primaries property (default).
 @end table
 
 @item color_trc
-Set the color transfert.
+Set the color transfer.
 Available values are:
 
 @table @samp
@@ -20136,7 +20136,7 @@ Default is @code{log}.
 
 @item acount
 Set how much frames to accumulate in histogram.
-Defauls is 1. Setting this to -1 accumulates all frames.
+Default is 1. Setting this to -1 accumulates all frames.
 
 @item rheight
 Set histogram ratio of window height.
diff --git a/doc/formats.texi b/doc/formats.texi
index 4f334e03c7..52a5ff8371 100644
--- a/doc/formats.texi
+++ b/doc/formats.texi
@@ -211,7 +211,7 @@ is @code{0} (meaning that no offset is applied).
 @item dump_separator @var{string} (@emph{input})
 Separator used to separate the fields printed on the command line about the
 Stream parameters.
-For example to separate the fields with newlines and indention:
+For example

[FFmpeg-cvslog] avcodec/aacenc: report channel layout by name

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick  | Fri Jul  6 
23:49:50 2018 +0200| [1693a6818730760b3f2e9fbc13354dcb6c31c86f] | committer: 
Michael Niedermayer

avcodec/aacenc: report channel layout by name

Possibly useful in the error case.

Signed-off-by: Moritz Barsnick 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1693a6818730760b3f2e9fbc13354dcb6c31c86f
---

 libavcodec/aacenc.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 6d94c76905..4d0abb107f 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -982,11 +982,13 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
 }
 
 if (s->needs_pce) {
+char buf[64];
 for (i = 0; i < FF_ARRAY_ELEMS(aac_pce_configs); i++)
 if (avctx->channel_layout == aac_pce_configs[i].layout)
 break;
-ERROR_IF(i == FF_ARRAY_ELEMS(aac_pce_configs), "Unsupported channel 
layout\n");
-av_log(avctx, AV_LOG_INFO, "Using a PCE to encode channel layout\n");
+av_get_channel_layout_string(buf, sizeof(buf), -1, 
avctx->channel_layout);
+ERROR_IF(i == FF_ARRAY_ELEMS(aac_pce_configs), "Unsupported channel 
layout \"%s\"\n", buf);
+av_log(avctx, AV_LOG_INFO, "Using a PCE to encode channel layout 
\"%s\"\n", buf);
 s->pce = aac_pce_configs[i];
 s->reorder_map = s->pce.reorder_map;
 s->chan_map = s->pce.config_map;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/vf_ocr: check ff_set_common_formats() return value

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Wed Nov  1 
01:30:57 2017 +0100| [a0560d0477549eaaa7d002e013bd8376e80873e4] | committer: 
Paul B Mahol

avfilter/vf_ocr: check ff_set_common_formats() return value

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0560d0477549eaaa7d002e013bd8376e80873e4
---

 libavfilter/vf_ocr.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavfilter/vf_ocr.c b/libavfilter/vf_ocr.c
index e003982f05..abfff49438 100644
--- a/libavfilter/vf_ocr.c
+++ b/libavfilter/vf_ocr.c
@@ -90,9 +90,7 @@ static int query_formats(AVFilterContext *ctx)
 AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
 if (!fmts_list)
 return AVERROR(ENOMEM);
-ff_set_common_formats(ctx, fmts_list);
-
-return 0;
+return ff_set_common_formats(ctx, fmts_list);
 }
 
 static int filter_frame(AVFilterLink *inlink, AVFrame *in)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavf/tls_gnutls: fix warnings from version check

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Tue Sep 26 
13:25:54 2017 +0200| [6bf48c4805cbb9754aa5a7bcb5f46df6bda95447] | committer: 
Carl Eugen Hoyos

lavf/tls_gnutls: fix warnings from version check

The GnuTLS version is checked through the macro GNUTLS_VERSION_NUMBER,
but this wasn't introduced before 2.7.2. Building with older versions
of GnuTLS (using icc) warns:

src/libavformat/tls_gnutls.c(38): warning #193: zero used for undefined 
preprocessing identifier "GNUTLS_VERSION_NUMBER"
  #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00

This adds a fallback to the older, deprecated LIBGNUTLS_VERSION_NUMBER
macro.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bf48c4805cbb9754aa5a7bcb5f46df6bda95447
---

 libavformat/tls_gnutls.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
index 7174dfd3fc..5ce6c3d448 100644
--- a/libavformat/tls_gnutls.c
+++ b/libavformat/tls_gnutls.c
@@ -35,6 +35,10 @@
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 
+#ifndef GNUTLS_VERSION_NUMBER
+#define GNUTLS_VERSION_NUMBER LIBGNUTLS_VERSION_NUMBER
+#endif
+
 #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
 #include 
 #include "libavutil/thread.h"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavf/tls_gnutls: fix compilation with GnuTLS 2.x

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Tue Sep 26 
13:25:53 2017 +0200| [16c8a9feeab36239bb7cf5f87fa8cad4dc50ae8c] | committer: 
Carl Eugen Hoyos

lavf/tls_gnutls: fix compilation with GnuTLS 2.x

Commit 598e41684066feba701d19ca7443d24b9e5efa77 added use of
GNUTLS_E_PREMATURE_TERMINATION, which wasn't introduced to GnuTLS
before 2.99.x / 3.x. This fixes compilation with older versions.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16c8a9feeab36239bb7cf5f87fa8cad4dc50ae8c
---

 libavformat/tls_gnutls.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
index 38f8ea4804..7174dfd3fc 100644
--- a/libavformat/tls_gnutls.c
+++ b/libavformat/tls_gnutls.c
@@ -72,7 +72,9 @@ static int print_tls_error(URLContext *h, int ret)
 switch (ret) {
 case GNUTLS_E_AGAIN:
 case GNUTLS_E_INTERRUPTED:
+#ifdef GNUTLS_E_PREMATURE_TERMINATION
 case GNUTLS_E_PREMATURE_TERMINATION:
+#endif
 break;
 case GNUTLS_E_WARNING_ALERT_RECEIVED:
 av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret));

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libavfilter/avf_showwaves: make sqrt and cbrt scale option values available to showwavespic by name

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Thu Mar  9 
10:23:28 2017 +0100| [114bbb0b74edd4c962095513117806c82ec06b61] | committer: 
Paul B Mahol

libavfilter/avf_showwaves: make sqrt and cbrt scale option values available to 
showwavespic by name

The 'sqrt' and 'cbrt' scalers were added in commit
80262d8c86e94ff9a4bb3a9e3c2d734e04ccb399, but their symbolic option values
only made available to the showwaves filter, not showwavespic, despite
the scalers working properly by their numerical option values.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=114bbb0b74edd4c962095513117806c82ec06b61
---

 doc/filters.texi| 18 +-
 libavfilter/avf_showwaves.c |  2 ++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index b5265d9..192a81a 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -17897,7 +17897,23 @@ Set if channels should be drawn separately or overlap. 
Default value is 0.
 Set colors separated by '|' which are going to be used for drawing of each 
channel.
 
 @item scale
-Set amplitude scale. Can be linear @code{lin} or logarithmic @code{log}.
+Set amplitude scale.
+
+Available values are:
+@table @samp
+@item lin
+Linear.
+
+@item log
+Logarithmic.
+
+@item sqrt
+Square root.
+
+@item cbrt
+Cubic root.
+@end table
+
 Default is linear.
 @end table
 
diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index 05aa995..aadc5c1 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -676,6 +676,8 @@ static const AVOption showwavespic_options[] = {
 { "scale", "set amplitude scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64 = 
0 }, 0, SCALE_NB-1, FLAGS, .unit="scale" },
 { "lin", "linear", 0, AV_OPT_TYPE_CONST, {.i64=SCALE_LIN}, 
.flags=FLAGS, .unit="scale"},
 { "log", "logarithmic",0, AV_OPT_TYPE_CONST, {.i64=SCALE_LOG}, 
.flags=FLAGS, .unit="scale"},
+{ "sqrt", "square root",   0, AV_OPT_TYPE_CONST, {.i64=SCALE_SQRT}, 
.flags=FLAGS, .unit="scale"},
+{ "cbrt", "cubic root",0, AV_OPT_TYPE_CONST, {.i64=SCALE_CBRT}, 
.flags=FLAGS, .unit="scale"},
 { NULL }
 };
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavf/xwma: fix incorrect format specifier

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Mon Jan 30 
21:22:41 2017 +0100| [0478728db02d68505020aa29f4895b8cfabb] | committer: 
Paul B Mahol

lavf/xwma: fix incorrect format specifier

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0478728db02d68505020aa29f4895b8cfabb
---

 libavformat/xwma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index df84d25..9235157 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -87,7 +87,7 @@ static int xwma_read_header(AVFormatContext *s)
  */
 if (st->codecpar->codec_id != AV_CODEC_ID_WMAV2 &&
 st->codecpar->codec_id != AV_CODEC_ID_WMAPRO) {
-avpriv_request_sample(s, "Unexpected codec (tag 0x04%x; id %d)",
+avpriv_request_sample(s, "Unexpected codec (tag 0x%04x; id %d)",
   st->codecpar->codec_tag, st->codecpar->codec_id);
 } else {
 /* In all xWMA files I have seen, there is no extradata. But the WMA

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc: document cutoff option to ac3 and adjust the option' s global documentation

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Fri Dec 30 
18:08:14 2016 +0100| [5dbce5120b4e05dd6d784e7ed9921c1f276acea3] | committer: 
Michael Niedermayer

doc: document cutoff option to ac3 and adjust the option's global documentation

cutoff is implemented as an option global to lavc, but supported only
by a few encoders. This fact is now reflected in its documentation. ac3's
support of this option is added for completeness.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5dbce5120b4e05dd6d784e7ed9921c1f276acea3
---

 doc/codecs.texi   | 3 ++-
 doc/encoders.texi | 4 
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/codecs.texi b/doc/codecs.texi
index 9a3a56d..6093605 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -138,7 +138,8 @@ Set audio sampling rate (in Hz).
 Set number of audio channels.
 
 @item cutoff @var{integer} (@emph{encoding,audio})
-Set cutoff bandwidth.
+Set cutoff bandwidth. (Supported only by selected encoders, see
+their respective documentation sections.)
 
 @item frame_size @var{integer} (@emph{encoding,audio})
 Set audio frame size.
diff --git a/doc/encoders.texi b/doc/encoders.texi
index 5e311cb..8137465 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -488,6 +488,10 @@ is an optional AC-3 feature that increases quality by 
selectively encoding
 the left/right channels as mid/side. This option is enabled by default, and it
 is highly recommended that it be left as enabled except for testing purposes.
 
+@item cutoff @var{frequency}
+Set lowpass cutoff frequency. If unspecified, the encoder selects a default
+determined by various other encoding parameters.
+
 @end table
 
 @subsection Floating-Point-Only AC-3 Encoding Options

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc/libmp3lame: add support for cutoff

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Fri Dec 30 
18:08:13 2016 +0100| [6c442e1584599471d1d43df2880feb9bda215163] | committer: 
Michael Niedermayer

lavc/libmp3lame: add support for cutoff

Pass the cutoff option from lavc's avcodec_options[] to libmp3lame's
lowpass option, without allowing to adjust its default behavior.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c442e1584599471d1d43df2880feb9bda215163
---

 doc/encoders.texi   | 4 
 libavcodec/libmp3lame.c | 4 
 2 files changed, 8 insertions(+)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index cbb8d8e..5e311cb 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -817,6 +817,10 @@ Set algorithm quality. Valid arguments are integers in the 
0-9 range,
 with 0 meaning highest quality but slowest, and 9 meaning fastest
 while producing the worst quality.
 
+@item cutoff (@emph{--lowpass})
+Set lowpass cutoff frequency. If unspecified, the encoder dynamically
+adjusts the cutoff.
+
 @item reservoir
 Enable use of bit reservoir when set to 1. Default value is 1. LAME
 has this enabled by default, but can be overridden by use
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
index e55aa85..5e26743 100644
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@@ -125,6 +125,10 @@ static av_cold int mp3lame_encode_init(AVCodecContext 
*avctx)
 }
 }
 
+/* lowpass cutoff frequency */
+if (avctx->cutoff)
+lame_set_lowpassfreq(s->gfp, avctx->cutoff);
+
 /* do not get a Xing VBR header frame from LAME */
 lame_set_bWriteVbrTag(s->gfp,0);
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] cmdutils: fix typos

[Moritz Barsnick]

ffmpeg | branch: release/2.8 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:57:02 2016 +0200| [d1c87a4a6fd9f32b9cd5e44190dc5ea0ad95b2dc] | committer: 
Michael Niedermayer

cmdutils: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 3e5d27d7a7350e096eac9f8999d02bf48c3b3a69)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1c87a4a6fd9f32b9cd5e44190dc5ea0ad95b2dc
---

 cmdutils.c | 4 ++--
 cmdutils.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index bc57be7..a712ad9 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -2075,7 +2075,7 @@ static int print_device_sources(AVInputFormat *fmt, 
AVDictionary *opts)
 if (!fmt || !fmt->priv_class  || 
!AV_IS_INPUT_DEVICE(fmt->priv_class->category))
 return AVERROR(EINVAL);
 
-printf("Audo-detected sources for %s:\n", fmt->name);
+printf("Auto-detected sources for %s:\n", fmt->name);
 if (!fmt->get_device_list) {
 ret = AVERROR(ENOSYS);
 printf("Cannot list sources. Not implemented.\n");
@@ -2105,7 +2105,7 @@ static int print_device_sinks(AVOutputFormat *fmt, 
AVDictionary *opts)
 if (!fmt || !fmt->priv_class  || 
!AV_IS_OUTPUT_DEVICE(fmt->priv_class->category))
 return AVERROR(EINVAL);
 
-printf("Audo-detected sinks for %s:\n", fmt->name);
+printf("Auto-detected sinks for %s:\n", fmt->name);
 if (!fmt->get_device_list) {
 ret = AVERROR(ENOSYS);
 printf("Cannot list sinks. Not implemented.\n");
diff --git a/cmdutils.h b/cmdutils.h
index e5ea45b..c838606 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -450,13 +450,13 @@ int show_devices(void *optctx, const char *opt, const 
char *arg);
 
 #if CONFIG_AVDEVICE
 /**
- * Print a listing containing audodetected sinks of the output device.
+ * Print a listing containing autodetected sinks of the output device.
  * Device name with options may be passed as an argument to limit results.
  */
 int show_sinks(void *optctx, const char *opt, const char *arg);
 
 /**
- * Print a listing containing audodetected sources of the input device.
+ * Print a listing containing autodetected sources of the input device.
  * Device name with options may be passed as an argument to limit results.
  */
 int show_sources(void *optctx, const char *opt, const char *arg);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: fix typos

[Moritz Barsnick]

ffmpeg | branch: release/2.8 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:56:59 2016 +0200| [bb83ff8b4192adc640df62e235c8e0646d119736] | committer: 
Michael Niedermayer

lavc: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 3305f71025289970fb34473adce5d9c65d1af016)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb83ff8b4192adc640df62e235c8e0646d119736
---

 libavcodec/asvenc.c| 2 +-
 libavcodec/mpeg12dec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c
index d51df80..5f1a602 100644
--- a/libavcodec/asvenc.c
+++ b/libavcodec/asvenc.c
@@ -61,7 +61,7 @@ static inline void asv2_put_level(ASV1Context *a, 
PutBitContext *pb, int level)
 } else {
 put_bits(pb, ff_asv2_level_tab[31][1], ff_asv2_level_tab[31][0]);
 if (level < -128 || level > 127) {
-av_log(a->avctx, AV_LOG_WARNING, "Cliping level %d, increase 
qscale\n", level);
+av_log(a->avctx, AV_LOG_WARNING, "Clipping level %d, increase 
qscale\n", level);
 level = av_clip_int8(level);
 }
 asv2_put_bits(pb, 8, level & 0xFF);
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index f549b83..50bb8f0 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2429,7 +2429,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx,
 tc = avctx->timecode_frame_start = get_bits(>gb, 25);
 
 s->closed_gop = get_bits1(>gb);
-/* broken_link indicate that after editing the
+/* broken_link indicates that after editing the
  * reference frames of the first B-Frames after GOP I-Frame
  * are missing (open gop) */
 broken_link = get_bits1(>gb);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavfi: fix typos

[Moritz Barsnick]

ffmpeg | branch: release/2.8 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:57:00 2016 +0200| [b480ca4dbd4b7e5c0b362cdc118473cdf84dc9f9] | committer: 
Michael Niedermayer

lavfi: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit f4e4bde1f4cff99d4ec59ed361ff9228b2050e6b)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b480ca4dbd4b7e5c0b362cdc118473cdf84dc9f9
---

 libavfilter/af_pan.c| 4 ++--
 libavfilter/vf_blackframe.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 9117cc0..64d6a93 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -109,7 +109,7 @@ static av_cold int init(AVFilterContext *ctx)
 if (!pan->args) {
 av_log(ctx, AV_LOG_ERROR,
"pan filter needs a channel layout and a set "
-   "of channels definitions as parameter\n");
+   "of channel definitions as parameter\n");
 return AVERROR(EINVAL);
 }
 if (!args)
@@ -274,7 +274,7 @@ static int config_props(AVFilterLink *link)
 if (link->channels > MAX_CHANNELS ||
 pan->nb_output_channels > MAX_CHANNELS) {
 av_log(ctx, AV_LOG_ERROR,
-   "af_pan support a maximum of %d channels. "
+   "af_pan supports a maximum of %d channels. "
"Feel free to ask for a higher limit.\n", MAX_CHANNELS);
 return AVERROR_PATCHWELCOME;
 }
diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c
index ad6d488..9fe2a42 100644
--- a/libavfilter/vf_blackframe.c
+++ b/libavfilter/vf_blackframe.c
@@ -104,8 +104,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*frame)
 #define OFFSET(x) offsetof(BlackFrameContext, x)
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
 static const AVOption blackframe_options[] = {
-{ "amount", "Percentage of the pixels that have to be below the threshold "
-"for the frame to be considered black.", OFFSET(bamount), 
AV_OPT_TYPE_INT, { .i64 = 98 }, 0, 100, FLAGS },
+{ "amount", "percentage of the pixels that have to be below the threshold "
+"for the frame to be considered black",  OFFSET(bamount), 
AV_OPT_TYPE_INT, { .i64 = 98 }, 0, 100, FLAGS },
 { "threshold", "threshold below which a pixel value is considered black",
  OFFSET(bthresh), 
AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 255, FLAGS },
 { "thresh", "threshold below which a pixel value is considered black",

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] tools: fix grammar error

[Moritz Barsnick]

ffmpeg | branch: release/2.8 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:56:58 2016 +0200| [d609986f39768f55bc67f144799c6f4466ee1c0a] | committer: 
Michael Niedermayer

tools: fix grammar error

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit f71c98ee12f9a9e950b4a8fb6b1548fee91ba1f8)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d609986f39768f55bc67f144799c6f4466ee1c0a
---

 tools/ismindex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ismindex.c b/tools/ismindex.c
index 8636c96..26b822c 100644
--- a/tools/ismindex.c
+++ b/tools/ismindex.c
@@ -375,7 +375,7 @@ static int read_tfra(struct Tracks *tracks, int 
start_index, AVIOContext *f)
  track->duration -
  
track->offsets[track->chunks - 1].time;
 }
-// Now try and read the actual durations from the trun sample data.
+// Now try to read the actual durations from the trun sample data.
 for (i = 0; i < track->chunks; i++) {
 int64_t duration = read_moof_duration(f, track->offsets[i].offset);
 if (duration > 0 && abs(duration - track->offsets[i].duration) > 3) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavfi/pan: allow negative gain parameters also for other inputs than the first named

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Fri Oct 28 
14:13:25 2016 +0200| [0700d02a697e0a2901abc6422edfe72a246bae01] | committer: 
Michael Niedermayer

lavfi/pan: allow negative gain parameters also for other inputs than the first 
named

Expands the parser to also accept the separator '-' in addition to
'+', and take the negative sign into consideration.

The optional sign for the first factor in the expression is already
covered by parsing for an integer.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Reviewed-by: Nicolas George <geo...@nsup.org>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0700d02a697e0a2901abc6422edfe72a246bae01
---

 doc/filters.texi |  2 +-
 libavfilter/af_pan.c | 10 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index b15f78a..b3899b2 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3026,7 +3026,7 @@ output channel layout or number of channels
 
 @item outdef
 output channel specification, of the form:
-"@var{out_name}=[@var{gain}*]@var{in_name}[+[@var{gain}*]@var{in_name}...]"
+"@var{out_name}=[@var{gain}*]@var{in_name}[(+-)[@var{gain}*]@var{in_name}...]"
 
 @item out_name
 output channel to define, either a channel name (FL, FR, etc.) or a channel
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index fbd79a5..94f1587 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -102,7 +102,7 @@ static av_cold int init(AVFilterContext *ctx)
 {
 PanContext *const pan = ctx->priv;
 char *arg, *arg0, *tokenizer, *args = av_strdup(pan->args);
-int out_ch_id, in_ch_id, len, named, ret;
+int out_ch_id, in_ch_id, len, named, ret, sign = 1;
 int nb_in_channels[2] = { 0, 0 }; // number of unnamed and named input 
channels
 double gain;
 
@@ -178,14 +178,18 @@ static av_cold int init(AVFilterContext *ctx)
 ret = AVERROR(EINVAL);
 goto fail;
 }
-pan->gain[out_ch_id][in_ch_id] = gain;
+pan->gain[out_ch_id][in_ch_id] = sign * gain;
 skip_spaces();
 if (!*arg)
 break;
-if (*arg != '+') {
+if (*arg == '-') {
+sign = -1;
+} else if (*arg != '+') {
 av_log(ctx, AV_LOG_ERROR, "Syntax error near \"%.8s\"\n", arg);
 ret = AVERROR(EINVAL);
 goto fail;
+} else {
+sign = 1;
 }
 arg++;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc/bsfs: various improvements

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Tue Nov 15 
23:15:27 2016 +0100| [c493a531edfd7b6956c563e19eb3a851b76797de] | committer: 
Lou Logan

doc/bsfs: various improvements

- Restored alphabetical order.
- Enhanced sections aac_adtstoasc, dca_core, h264_mp4toannexb.
- Added sections hevc_mp4toannexb and vp9_superframe.
- Renamed (if required) and filled previously empty sections
  mjpegadump, mov2textsub/text2movsub, mp3decomp, and
  remove_extra.
- Fixes ticket #3198.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Lou Logan <l...@lrcd.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c493a531edfd7b6956c563e19eb3a851b76797de
---

 doc/bitstream_filters.texi | 95 --
 1 file changed, 83 insertions(+), 12 deletions(-)

diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi
index a85327f..e397ff9 100644
--- a/doc/bitstream_filters.texi
+++ b/doc/bitstream_filters.texi
@@ -26,19 +26,26 @@ with their parameters, if any.
 
 @section aac_adtstoasc
 
-Convert MPEG-2/4 AAC ADTS to MPEG-4 Audio Specific Configuration
-bitstream filter.
+Convert MPEG-2/4 AAC ADTS to an MPEG-4 Audio Specific Configuration
+bitstream.
 
 This filter creates an MPEG-4 AudioSpecificConfig from an MPEG-2/4
 ADTS header and removes the ADTS header.
 
-This is required for example when copying an AAC stream from a raw
-ADTS AAC container to a FLV or a MOV/MP4 file.
+This filter is required for example when copying an AAC stream from a
+raw ADTS AAC or an MPEG-TS container to MP4A-LATM, to an FLV file, or
+to MOV/MP4 files and related formats such as 3GP or M4A. Please note
+that it is auto-inserted for MP4A-LATM and MOV/MP4 and related formats.
 
 @section chomp
 
 Remove zero padding at the end of a packet.
 
+@section dca_core
+
+Extract the core from a DCA/DTS stream, dropping extensions such as
+DTS-HD.
+
 @section dump_extra
 
 Add extradata to the beginning of the filtered packets.
@@ -67,10 +74,6 @@ the header stored in extradata to the key packets:
 ffmpeg -i INPUT -map 0 -flags:v +global_header -c:v libx264 -bsf:v dump_extra 
out.ts
 @end example
 
-@section dca_core
-
-Extract DCA core from DTS-HD streams.
-
 @section h264_mp4toannexb
 
 Convert an H.264 bitstream from length prefixed mode to start code
@@ -78,7 +81,7 @@ prefixed mode (as defined in the Annex B of the ITU-T H.264
 specification).
 
 This is required by some streaming formats, typically the MPEG-2
-transport stream format ("mpegts").
+transport stream format (muxer @code{mpegts}).
 
 For example to remux an MP4 file containing an H.264 stream to mpegts
 format with @command{ffmpeg}, you can use the command:
@@ -87,6 +90,29 @@ format with @command{ffmpeg}, you can use the command:
 ffmpeg -i INPUT.mp4 -codec copy -bsf:v h264_mp4toannexb OUTPUT.ts
 @end example
 
+Please note that this filter is auto-inserted for MPEG-TS (muxer
+@code{mpegts}) and raw H.264 (muxer @code{h264}) output formats.
+
+@section hevc_mp4toannexb
+
+Convert an HEVC/H.265 bitstream from length prefixed mode to start code
+prefixed mode (as defined in the Annex B of the ITU-T H.265
+specification).
+
+This is required by some streaming formats, typically the MPEG-2
+transport stream format (muxer @code{mpegts}).
+
+For example to remux an MP4 file containing an HEVC stream to mpegts
+format with @command{ffmpeg}, you can use the command:
+
+@example
+ffmpeg -i INPUT.mp4 -codec copy -bsf:v hevc_mp4toannexb OUTPUT.ts
+@end example
+
+Please note that this filter is auto-inserted for MPEG-TS (muxer
+@code{mpegts}) and raw HEVC/H.265 (muxer @code{h265} or
+@code{hevc}) output formats.
+
 @section imxdump
 
 Modifies the bitstream to fit in MOV and to be usable by the Final Cut
@@ -137,11 +163,22 @@ exiftran -i -9 frame*.jpg
 ffmpeg -i frame_%d.jpg -c:v copy rotated.avi
 @end example
 
-@section mjpega_dump_header
+@section mjpegadump
+
+Add an MJPEG A header to the bitstream, to enable decoding by
+Quicktime.
 
-@section movsub
+@anchor{mov2textsub}
+@section mov2textsub
 
-@section mp3_header_decompress
+Extract a representable text file from MOV subtitles, stripping the
+metadata header from each subtitle packet.
+
+See also the @ref{text2movsub} filter.
+
+@section mp3decomp
+
+Decompress non-standard compressed MP3 audio headers.
 
 @section mpeg4_unpack_bframes
 
@@ -181,4 +218,38 @@ applies the modification to every byte.
 
 @section remove_extra
 
+Remove extradata from packets.
+
+It accepts the following parameter:
+@table @option
+@item freq
+Set which frame types to remove extradata from.
+
+@table @samp
+@item k
+Remove extradata from non-keyframes only.
+
+@item keyframe
+Remove extradata from keyframes only.
+
+@item e, all
+Remove extradata from all frames.
+
+@end table
+@end table
+
+@anchor{text2movsub}
+@section text2movsub
+
+Convert text subtitles to MOV subtitles (as used by the @code{mov_text}
+codec) with metadata headers.
+

[FFmpeg-cvslog] cmdutils: fix typos

[Moritz Barsnick]

ffmpeg | branch: release/3.0 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:57:02 2016 +0200| [88f52f2f8f210e0edba8559f567d0d39a609401c] | committer: 
Michael Niedermayer

cmdutils: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 3e5d27d7a7350e096eac9f8999d02bf48c3b3a69)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88f52f2f8f210e0edba8559f567d0d39a609401c
---

 cmdutils.c | 4 ++--
 cmdutils.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index 3bb8bde..476c858 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -2111,7 +2111,7 @@ static int print_device_sources(AVInputFormat *fmt, 
AVDictionary *opts)
 if (!fmt || !fmt->priv_class  || 
!AV_IS_INPUT_DEVICE(fmt->priv_class->category))
 return AVERROR(EINVAL);
 
-printf("Audo-detected sources for %s:\n", fmt->name);
+printf("Auto-detected sources for %s:\n", fmt->name);
 if (!fmt->get_device_list) {
 ret = AVERROR(ENOSYS);
 printf("Cannot list sources. Not implemented.\n");
@@ -2141,7 +2141,7 @@ static int print_device_sinks(AVOutputFormat *fmt, 
AVDictionary *opts)
 if (!fmt || !fmt->priv_class  || 
!AV_IS_OUTPUT_DEVICE(fmt->priv_class->category))
 return AVERROR(EINVAL);
 
-printf("Audo-detected sinks for %s:\n", fmt->name);
+printf("Auto-detected sinks for %s:\n", fmt->name);
 if (!fmt->get_device_list) {
 ret = AVERROR(ENOSYS);
 printf("Cannot list sinks. Not implemented.\n");
diff --git a/cmdutils.h b/cmdutils.h
index 67bf484..1b96aa4 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -450,13 +450,13 @@ int show_devices(void *optctx, const char *opt, const 
char *arg);
 
 #if CONFIG_AVDEVICE
 /**
- * Print a listing containing audodetected sinks of the output device.
+ * Print a listing containing autodetected sinks of the output device.
  * Device name with options may be passed as an argument to limit results.
  */
 int show_sinks(void *optctx, const char *opt, const char *arg);
 
 /**
- * Print a listing containing audodetected sources of the input device.
+ * Print a listing containing autodetected sources of the input device.
  * Device name with options may be passed as an argument to limit results.
  */
 int show_sources(void *optctx, const char *opt, const char *arg);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavfi: fix typos

[Moritz Barsnick]

ffmpeg | branch: release/3.0 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:57:00 2016 +0200| [8baf2d8fadc16d7f2c7d4e686f19e495ae6cc07e] | committer: 
Michael Niedermayer

lavfi: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit f4e4bde1f4cff99d4ec59ed361ff9228b2050e6b)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8baf2d8fadc16d7f2c7d4e686f19e495ae6cc07e
---

 libavfilter/af_pan.c| 4 ++--
 libavfilter/vf_blackframe.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 1eb102c..7c02f67 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -109,7 +109,7 @@ static av_cold int init(AVFilterContext *ctx)
 if (!pan->args) {
 av_log(ctx, AV_LOG_ERROR,
"pan filter needs a channel layout and a set "
-   "of channels definitions as parameter\n");
+   "of channel definitions as parameter\n");
 return AVERROR(EINVAL);
 }
 if (!args)
@@ -276,7 +276,7 @@ static int config_props(AVFilterLink *link)
 if (link->channels > MAX_CHANNELS ||
 pan->nb_output_channels > MAX_CHANNELS) {
 av_log(ctx, AV_LOG_ERROR,
-   "af_pan support a maximum of %d channels. "
+   "af_pan supports a maximum of %d channels. "
"Feel free to ask for a higher limit.\n", MAX_CHANNELS);
 return AVERROR_PATCHWELCOME;
 }
diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c
index ad6d488..9fe2a42 100644
--- a/libavfilter/vf_blackframe.c
+++ b/libavfilter/vf_blackframe.c
@@ -104,8 +104,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*frame)
 #define OFFSET(x) offsetof(BlackFrameContext, x)
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
 static const AVOption blackframe_options[] = {
-{ "amount", "Percentage of the pixels that have to be below the threshold "
-"for the frame to be considered black.", OFFSET(bamount), 
AV_OPT_TYPE_INT, { .i64 = 98 }, 0, 100, FLAGS },
+{ "amount", "percentage of the pixels that have to be below the threshold "
+"for the frame to be considered black",  OFFSET(bamount), 
AV_OPT_TYPE_INT, { .i64 = 98 }, 0, 100, FLAGS },
 { "threshold", "threshold below which a pixel value is considered black",
  OFFSET(bthresh), 
AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 255, FLAGS },
 { "thresh", "threshold below which a pixel value is considered black",

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: fix typos

[Moritz Barsnick]

ffmpeg | branch: release/3.0 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:56:59 2016 +0200| [17b8e7799f640a7cf41f4656184f3b5201e4d845] | committer: 
Michael Niedermayer

lavc: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 3305f71025289970fb34473adce5d9c65d1af016)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17b8e7799f640a7cf41f4656184f3b5201e4d845
---

 libavcodec/asvenc.c| 2 +-
 libavcodec/mpeg12dec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c
index ec98a0c..c4eca2a 100644
--- a/libavcodec/asvenc.c
+++ b/libavcodec/asvenc.c
@@ -61,7 +61,7 @@ static inline void asv2_put_level(ASV1Context *a, 
PutBitContext *pb, int level)
 } else {
 put_bits(pb, ff_asv2_level_tab[31][1], ff_asv2_level_tab[31][0]);
 if (level < -128 || level > 127) {
-av_log(a->avctx, AV_LOG_WARNING, "Cliping level %d, increase 
qscale\n", level);
+av_log(a->avctx, AV_LOG_WARNING, "Clipping level %d, increase 
qscale\n", level);
 level = av_clip_int8(level);
 }
 asv2_put_bits(pb, 8, level & 0xFF);
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index cc8ace8..caa5f0c 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2432,7 +2432,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
 s->closed_gop = get_bits1(>gb);
-/* broken_link indicate that after editing the
+/* broken_link indicates that after editing the
  * reference frames of the first B-Frames after GOP I-Frame
  * are missing (open gop) */
 broken_link = get_bits1(>gb);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] tools: fix grammar error

[Moritz Barsnick]

ffmpeg | branch: release/3.0 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:56:58 2016 +0200| [6457346e6a15ed49cd146567c8cd415842daa3b9] | committer: 
Michael Niedermayer

tools: fix grammar error

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit f71c98ee12f9a9e950b4a8fb6b1548fee91ba1f8)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6457346e6a15ed49cd146567c8cd415842daa3b9
---

 tools/ismindex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ismindex.c b/tools/ismindex.c
index dfef118..363b7ee 100644
--- a/tools/ismindex.c
+++ b/tools/ismindex.c
@@ -375,7 +375,7 @@ static int read_tfra(struct Tracks *tracks, int 
start_index, AVIOContext *f)
  track->duration -
  
track->offsets[track->chunks - 1].time;
 }
-// Now try and read the actual durations from the trun sample data.
+// Now try to read the actual durations from the trun sample data.
 for (i = 0; i < track->chunks; i++) {
 int64_t duration = read_moof_duration(f, track->offsets[i].offset);
 if (duration > 0 && llabs(duration - track->offsets[i].duration) > 3) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc: fix various typos and grammar errors

[Moritz Barsnick]

ffmpeg | branch: release/3.1 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
20:51:57 2016 +0200| [6109c10b81d6bc484996e3407046302d3a537575] | committer: 
Michael Niedermayer

doc: fix various typos and grammar errors

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 99d68d462fbd777cfd3fe055d4181a6f7c03fac7)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6109c10b81d6bc484996e3407046302d3a537575
---

 doc/codecs.texi  |  2 +-
 doc/demuxers.texi|  4 ++--
 doc/ffmpeg.texi  |  2 +-
 doc/fftools-common-opts.texi |  8 
 doc/filters.texi | 42 +-
 doc/formats.texi |  2 +-
 doc/indevs.texi  |  4 ++--
 doc/muxers.texi  |  6 +++---
 doc/platform.texi|  2 +-
 doc/protocols.texi   |  2 +-
 10 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/doc/codecs.texi b/doc/codecs.texi
index 48fc3bf..3b197a7 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -1173,7 +1173,7 @@ Set to 1 to disable processing alpha (transparency). This 
works like the
 instead of alpha. Default is 0.
 
 @item codec_whitelist @var{list} (@emph{input})
-"," separated List of allowed decoders. By default all are allowed.
+"," separated list of allowed decoders. By default all are allowed.
 
 @item dump_separator @var{string} (@emph{input})
 Separator used to separate the fields printed on the command line about the
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index e34f8b3..25b12a8 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -72,7 +72,7 @@ Do not try to resynchronize by looking for a certain optional 
start code.
 Virtual concatenation script demuxer.
 
 This demuxer reads a list of files and other directives from a text file and
-demuxes them one after the other, as if all their packet had been muxed
+demuxes them one after the other, as if all their packets had been muxed
 together.
 
 The timestamps in the files are adjusted so that the first file starts at 0
@@ -107,7 +107,7 @@ Identify the script type and version. It also sets the 
@option{safe} option
 to 1 if it was -1.
 
 To make FFmpeg recognize the format automatically, this directive must
-appears exactly as is (no extra space or byte-order-mark) on the very first
+appear exactly as is (no extra space or byte-order-mark) on the very first
 line of the script.
 
 @item @code{duration @var{dur}}
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 7368cdb..3aefc34 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1008,7 +1008,7 @@ Dump each input packet to stderr.
 @item -hex (@emph{global})
 When dumping packets, also dump the payload.
 @item -re (@emph{input})
-Read input at native frame rate. Mainly used to simulate a grab device.
+Read input at native frame rate. Mainly used to simulate a grab device,
 or live input stream (e.g. when reading from a file). Should not be used
 with actual grab devices or live input streams (where it can cause packet
 loss).
diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index 509c8bc..a8e485f 100644
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -176,10 +176,10 @@ loglevel will be used. If multiple loglevel parameters 
are given, using
 Show nothing at all; be silent.
 @item panic, 0
 Only show fatal errors which could lead the process to crash, such as
-and assert failure. This is not currently used for anything.
+an assertion failure. This is not currently used for anything.
 @item fatal, 8
 Only show fatal errors. These are errors after which the process absolutely
-cannot continue after.
+cannot continue.
 @item error, 16
 Show all errors, including ones which can be recovered from.
 @item warning, 24
@@ -195,13 +195,13 @@ Show everything, including debugging information.
 @item trace, 56
 @end table
 
-By default the program logs to stderr, if coloring is supported by the
+By default the program logs to stderr. If coloring is supported by the
 terminal, colors are used to mark errors and warnings. Log coloring
 can be disabled setting the environment variable
 @env{AV_LOG_FORCE_NOCOLOR} or @env{NO_COLOR}, or can be forced setting
 the environment variable @env{AV_LOG_FORCE_COLOR}.
 The use of the environment variable @env{NO_COLOR} is deprecated and
-will be dropped in a following FFmpeg version.
+will be dropped in a future FFmpeg version.
 
 @item -report
 Dump full command line and console output to a file named
diff --git a/doc/filters.texi b/doc/filters.texi
index 3cf3d7c..b482236 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -845,14 +845,14 @@ A gate is mainly used to reduce lower parts of a signal. 
This kind of signal
 processing reduces disturbing noise between useful signals.

[FFmpeg-cvslog] lavfi: fix typos

[Moritz Barsnick]

ffmpeg | branch: release/3.1 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:57:00 2016 +0200| [f12c0da09b04dc8897a6856a34c1d4d58fbf025f] | committer: 
Michael Niedermayer

lavfi: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit f4e4bde1f4cff99d4ec59ed361ff9228b2050e6b)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f12c0da09b04dc8897a6856a34c1d4d58fbf025f
---

 libavfilter/af_pan.c| 4 ++--
 libavfilter/vf_blackframe.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 1eb102c..7c02f67 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -109,7 +109,7 @@ static av_cold int init(AVFilterContext *ctx)
 if (!pan->args) {
 av_log(ctx, AV_LOG_ERROR,
"pan filter needs a channel layout and a set "
-   "of channels definitions as parameter\n");
+   "of channel definitions as parameter\n");
 return AVERROR(EINVAL);
 }
 if (!args)
@@ -276,7 +276,7 @@ static int config_props(AVFilterLink *link)
 if (link->channels > MAX_CHANNELS ||
 pan->nb_output_channels > MAX_CHANNELS) {
 av_log(ctx, AV_LOG_ERROR,
-   "af_pan support a maximum of %d channels. "
+   "af_pan supports a maximum of %d channels. "
"Feel free to ask for a higher limit.\n", MAX_CHANNELS);
 return AVERROR_PATCHWELCOME;
 }
diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c
index ad6d488..9fe2a42 100644
--- a/libavfilter/vf_blackframe.c
+++ b/libavfilter/vf_blackframe.c
@@ -104,8 +104,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*frame)
 #define OFFSET(x) offsetof(BlackFrameContext, x)
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
 static const AVOption blackframe_options[] = {
-{ "amount", "Percentage of the pixels that have to be below the threshold "
-"for the frame to be considered black.", OFFSET(bamount), 
AV_OPT_TYPE_INT, { .i64 = 98 }, 0, 100, FLAGS },
+{ "amount", "percentage of the pixels that have to be below the threshold "
+"for the frame to be considered black",  OFFSET(bamount), 
AV_OPT_TYPE_INT, { .i64 = 98 }, 0, 100, FLAGS },
 { "threshold", "threshold below which a pixel value is considered black",
  OFFSET(bthresh), 
AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 255, FLAGS },
 { "thresh", "threshold below which a pixel value is considered black",

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] cmdutils: fix typos

[Moritz Barsnick]

ffmpeg | branch: release/3.1 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:57:02 2016 +0200| [7fefd776682ae9a138d808f8e91e8c74574187db] | committer: 
Michael Niedermayer

cmdutils: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 3e5d27d7a7350e096eac9f8999d02bf48c3b3a69)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fefd776682ae9a138d808f8e91e8c74574187db
---

 cmdutils.c | 4 ++--
 cmdutils.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index 3bb8bde..476c858 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -2111,7 +2111,7 @@ static int print_device_sources(AVInputFormat *fmt, 
AVDictionary *opts)
 if (!fmt || !fmt->priv_class  || 
!AV_IS_INPUT_DEVICE(fmt->priv_class->category))
 return AVERROR(EINVAL);
 
-printf("Audo-detected sources for %s:\n", fmt->name);
+printf("Auto-detected sources for %s:\n", fmt->name);
 if (!fmt->get_device_list) {
 ret = AVERROR(ENOSYS);
 printf("Cannot list sources. Not implemented.\n");
@@ -2141,7 +2141,7 @@ static int print_device_sinks(AVOutputFormat *fmt, 
AVDictionary *opts)
 if (!fmt || !fmt->priv_class  || 
!AV_IS_OUTPUT_DEVICE(fmt->priv_class->category))
 return AVERROR(EINVAL);
 
-printf("Audo-detected sinks for %s:\n", fmt->name);
+printf("Auto-detected sinks for %s:\n", fmt->name);
 if (!fmt->get_device_list) {
 ret = AVERROR(ENOSYS);
 printf("Cannot list sinks. Not implemented.\n");
diff --git a/cmdutils.h b/cmdutils.h
index 67bf484..1b96aa4 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -450,13 +450,13 @@ int show_devices(void *optctx, const char *opt, const 
char *arg);
 
 #if CONFIG_AVDEVICE
 /**
- * Print a listing containing audodetected sinks of the output device.
+ * Print a listing containing autodetected sinks of the output device.
  * Device name with options may be passed as an argument to limit results.
  */
 int show_sinks(void *optctx, const char *opt, const char *arg);
 
 /**
- * Print a listing containing audodetected sources of the input device.
+ * Print a listing containing autodetected sources of the input device.
  * Device name with options may be passed as an argument to limit results.
  */
 int show_sources(void *optctx, const char *opt, const char *arg);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] tools: fix grammar error

[Moritz Barsnick]

ffmpeg | branch: release/3.1 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:56:58 2016 +0200| [fc36e692c4ac782f5a0327ead530b37c64e2c4f2] | committer: 
Michael Niedermayer

tools: fix grammar error

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit f71c98ee12f9a9e950b4a8fb6b1548fee91ba1f8)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc36e692c4ac782f5a0327ead530b37c64e2c4f2
---

 tools/ismindex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ismindex.c b/tools/ismindex.c
index 5917d42..c16e2f2 100644
--- a/tools/ismindex.c
+++ b/tools/ismindex.c
@@ -375,7 +375,7 @@ static int read_tfra(struct Tracks *tracks, int 
start_index, AVIOContext *f)
  track->duration -
  
track->offsets[track->chunks - 1].time;
 }
-// Now try and read the actual durations from the trun sample data.
+// Now try to read the actual durations from the trun sample data.
 for (i = 0; i < track->chunks; i++) {
 int64_t duration = read_moof_duration(f, track->offsets[i].offset);
 if (duration > 0 && llabs(duration - track->offsets[i].duration) > 3) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: fix typos

[Moritz Barsnick]

ffmpeg | branch: release/3.1 | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:56:59 2016 +0200| [30c80e81d2a5f50f438a69912ae197beb4fc7716] | committer: 
Michael Niedermayer

lavc: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 3305f71025289970fb34473adce5d9c65d1af016)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30c80e81d2a5f50f438a69912ae197beb4fc7716
---

 libavcodec/asvenc.c| 2 +-
 libavcodec/mpeg12dec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c
index ec98a0c..c4eca2a 100644
--- a/libavcodec/asvenc.c
+++ b/libavcodec/asvenc.c
@@ -61,7 +61,7 @@ static inline void asv2_put_level(ASV1Context *a, 
PutBitContext *pb, int level)
 } else {
 put_bits(pb, ff_asv2_level_tab[31][1], ff_asv2_level_tab[31][0]);
 if (level < -128 || level > 127) {
-av_log(a->avctx, AV_LOG_WARNING, "Cliping level %d, increase 
qscale\n", level);
+av_log(a->avctx, AV_LOG_WARNING, "Clipping level %d, increase 
qscale\n", level);
 level = av_clip_int8(level);
 }
 asv2_put_bits(pb, 8, level & 0xFF);
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 204a578..7e730b8 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2389,7 +2389,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
 s->closed_gop = get_bits1(>gb);
-/* broken_link indicate that after editing the
+/* broken_link indicates that after editing the
  * reference frames of the first B-Frames after GOP I-Frame
  * are missing (open gop) */
 broken_link = get_bits1(>gb);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc: fix various typos and grammar errors

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
20:51:57 2016 +0200| [99d68d462fbd777cfd3fe055d4181a6f7c03fac7] | committer: 
Michael Niedermayer

doc: fix various typos and grammar errors

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99d68d462fbd777cfd3fe055d4181a6f7c03fac7
---

 doc/codecs.texi  |  2 +-
 doc/demuxers.texi|  4 ++--
 doc/ffmpeg.texi  |  2 +-
 doc/fftools-common-opts.texi |  8 
 doc/filters.texi | 42 +-
 doc/formats.texi |  2 +-
 doc/indevs.texi  |  4 ++--
 doc/muxers.texi  |  6 +++---
 doc/platform.texi|  2 +-
 doc/protocols.texi   |  2 +-
 10 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/doc/codecs.texi b/doc/codecs.texi
index 913e257..9d0b980 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -1226,7 +1226,7 @@ Set to 1 to disable processing alpha (transparency). This 
works like the
 instead of alpha. Default is 0.
 
 @item codec_whitelist @var{list} (@emph{input})
-"," separated List of allowed decoders. By default all are allowed.
+"," separated list of allowed decoders. By default all are allowed.
 
 @item dump_separator @var{string} (@emph{input})
 Separator used to separate the fields printed on the command line about the
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 69890c8..87f78f3 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -72,7 +72,7 @@ Do not try to resynchronize by looking for a certain optional 
start code.
 Virtual concatenation script demuxer.
 
 This demuxer reads a list of files and other directives from a text file and
-demuxes them one after the other, as if all their packet had been muxed
+demuxes them one after the other, as if all their packets had been muxed
 together.
 
 The timestamps in the files are adjusted so that the first file starts at 0
@@ -107,7 +107,7 @@ Identify the script type and version. It also sets the 
@option{safe} option
 to 1 if it was -1.
 
 To make FFmpeg recognize the format automatically, this directive must
-appears exactly as is (no extra space or byte-order-mark) on the very first
+appear exactly as is (no extra space or byte-order-mark) on the very first
 line of the script.
 
 @item @code{duration @var{dur}}
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index b00de30..47c8935 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1008,7 +1008,7 @@ Dump each input packet to stderr.
 @item -hex (@emph{global})
 When dumping packets, also dump the payload.
 @item -re (@emph{input})
-Read input at native frame rate. Mainly used to simulate a grab device.
+Read input at native frame rate. Mainly used to simulate a grab device,
 or live input stream (e.g. when reading from a file). Should not be used
 with actual grab devices or live input streams (where it can cause packet
 loss).
diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index 509c8bc..a8e485f 100644
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -176,10 +176,10 @@ loglevel will be used. If multiple loglevel parameters 
are given, using
 Show nothing at all; be silent.
 @item panic, 0
 Only show fatal errors which could lead the process to crash, such as
-and assert failure. This is not currently used for anything.
+an assertion failure. This is not currently used for anything.
 @item fatal, 8
 Only show fatal errors. These are errors after which the process absolutely
-cannot continue after.
+cannot continue.
 @item error, 16
 Show all errors, including ones which can be recovered from.
 @item warning, 24
@@ -195,13 +195,13 @@ Show everything, including debugging information.
 @item trace, 56
 @end table
 
-By default the program logs to stderr, if coloring is supported by the
+By default the program logs to stderr. If coloring is supported by the
 terminal, colors are used to mark errors and warnings. Log coloring
 can be disabled setting the environment variable
 @env{AV_LOG_FORCE_NOCOLOR} or @env{NO_COLOR}, or can be forced setting
 the environment variable @env{AV_LOG_FORCE_COLOR}.
 The use of the environment variable @env{NO_COLOR} is deprecated and
-will be dropped in a following FFmpeg version.
+will be dropped in a future FFmpeg version.
 
 @item -report
 Dump full command line and console output to a file named
diff --git a/doc/filters.texi b/doc/filters.texi
index 4b2f7bf..76265e7 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -911,14 +911,14 @@ A gate is mainly used to reduce lower parts of a signal. 
This kind of signal
 processing reduces disturbing noise between useful signals.
 
 Gating is done by detecting the volume below a chosen level @var{threshold}
-and divide it by the factor set with @var{ratio}. The bottom of the

[FFmpeg-cvslog] lavfi/pan: renormalize negative gain coefficients properly

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
03:49:15 2016 +0200| [efbc37a757d6b41af1a5752ff810db1dcf3fe78c] | committer: 
Michael Niedermayer

lavfi/pan: renormalize negative gain coefficients properly

The parser for the outdef will accept a negative value for the first
named channel's gain. As negative values effectively only invert the
phase of the signal, and not negate the level, the gains' absolute
values must be used to correctly accumulate the levels.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Reviewed-by: Nicolas George <geo...@nsup.org>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efbc37a757d6b41af1a5752ff810db1dcf3fe78c
---

 libavfilter/af_pan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 7c02f67..fbd79a5 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -322,7 +322,7 @@ static int config_props(AVFilterLink *link)
 continue;
 t = 0;
 for (j = 0; j < link->channels; j++)
-t += pan->gain[i][j];
+t += fabs(pan->gain[i][j]);
 if (t > -1E-5 && t < 1E-5) {
 // t is almost 0 but not exactly, this is probably a mistake
 if (t)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavfi: fix typos

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:57:00 2016 +0200| [f4e4bde1f4cff99d4ec59ed361ff9228b2050e6b] | committer: 
Michael Niedermayer

lavfi: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4e4bde1f4cff99d4ec59ed361ff9228b2050e6b
---

 libavfilter/af_pan.c| 4 ++--
 libavfilter/vf_blackframe.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 1eb102c..7c02f67 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -109,7 +109,7 @@ static av_cold int init(AVFilterContext *ctx)
 if (!pan->args) {
 av_log(ctx, AV_LOG_ERROR,
"pan filter needs a channel layout and a set "
-   "of channels definitions as parameter\n");
+   "of channel definitions as parameter\n");
 return AVERROR(EINVAL);
 }
 if (!args)
@@ -276,7 +276,7 @@ static int config_props(AVFilterLink *link)
 if (link->channels > MAX_CHANNELS ||
 pan->nb_output_channels > MAX_CHANNELS) {
 av_log(ctx, AV_LOG_ERROR,
-   "af_pan support a maximum of %d channels. "
+   "af_pan supports a maximum of %d channels. "
"Feel free to ask for a higher limit.\n", MAX_CHANNELS);
 return AVERROR_PATCHWELCOME;
 }
diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c
index ad6d488..9fe2a42 100644
--- a/libavfilter/vf_blackframe.c
+++ b/libavfilter/vf_blackframe.c
@@ -104,8 +104,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame 
*frame)
 #define OFFSET(x) offsetof(BlackFrameContext, x)
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
 static const AVOption blackframe_options[] = {
-{ "amount", "Percentage of the pixels that have to be below the threshold "
-"for the frame to be considered black.", OFFSET(bamount), 
AV_OPT_TYPE_INT, { .i64 = 98 }, 0, 100, FLAGS },
+{ "amount", "percentage of the pixels that have to be below the threshold "
+"for the frame to be considered black",  OFFSET(bamount), 
AV_OPT_TYPE_INT, { .i64 = 98 }, 0, 100, FLAGS },
 { "threshold", "threshold below which a pixel value is considered black",
  OFFSET(bthresh), 
AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 255, FLAGS },
 { "thresh", "threshold below which a pixel value is considered black",

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavf: fix typos

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:57:01 2016 +0200| [468c596a31ca90012ed78cfe6966ca6f3ec11f38] | committer: 
Michael Niedermayer

lavf: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=468c596a31ca90012ed78cfe6966ca6f3ec11f38
---

 libavformat/hlsenc.c  | 4 ++--
 libavformat/oggparsevp8.c | 2 +-
 libavformat/swfdec.c  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index e0bb44b..9ca2df7 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -516,7 +516,7 @@ static int hls_window(AVFormatContext *s, int last)
 }
 
 if (!use_rename && !warned_non_file++)
-av_log(s, AV_LOG_ERROR, "Cannot use rename on non file protocol, this 
may lead to races and temporarly partial files\n");
+av_log(s, AV_LOG_ERROR, "Cannot use rename on non file protocol, this 
may lead to races and temporary partial files\n");
 
 set_http_options(, hls);
 snprintf(temp_filename, sizeof(temp_filename), use_rename ? "%s.tmp" : 
"%s", s->filename);
@@ -686,7 +686,7 @@ static int hls_start(AVFormatContext *s)
 } else if (av_get_frame_filename2(oc->filename, sizeof(oc->filename),
   c->basename, c->wrap ? c->sequence % c->wrap 
: c->sequence,
   AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
-av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' 
you can try use -use_localtime 1 with it\n", c->basename);
+av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' 
you can try to use -use_localtime 1 with it\n", c->basename);
 return AVERROR(EINVAL);
 }
 if( c->vtt_basename) {
diff --git a/libavformat/oggparsevp8.c b/libavformat/oggparsevp8.c
index 6716dd2..c534ab1 100644
--- a/libavformat/oggparsevp8.c
+++ b/libavformat/oggparsevp8.c
@@ -84,7 +84,7 @@ static uint64_t vp8_gptopts(AVFormatContext *s, int idx,
 
 int invcnt= !((granule >> 30) & 3);
 // If page granule is that of an invisible vp8 frame, its pts will be
-// that of the end of the next visible frame. We substract 1 for those
+// that of the end of the next visible frame. We subtract 1 for those
 // to prevent messing up pts calculations.
 uint64_t pts  = (granule >> 32) - invcnt;
 uint32_t dist = (granule >>  3) & 0x07ff;
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 3268c0a..b91560c 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -518,7 +518,7 @@ bitmap_end_skip:
 }
 skip:
 if(len<0)
-av_log(s, AV_LOG_WARNING, "Cliping len %d\n", len);
+av_log(s, AV_LOG_WARNING, "Clipping len %d\n", len);
 len = FFMAX(0, len);
 avio_skip(pb, len);
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc: fix typos

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:56:59 2016 +0200| [3305f71025289970fb34473adce5d9c65d1af016] | committer: 
Michael Niedermayer

lavc: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3305f71025289970fb34473adce5d9c65d1af016
---

 libavcodec/asvenc.c| 2 +-
 libavcodec/mpeg12dec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c
index ec98a0c..c4eca2a 100644
--- a/libavcodec/asvenc.c
+++ b/libavcodec/asvenc.c
@@ -61,7 +61,7 @@ static inline void asv2_put_level(ASV1Context *a, 
PutBitContext *pb, int level)
 } else {
 put_bits(pb, ff_asv2_level_tab[31][1], ff_asv2_level_tab[31][0]);
 if (level < -128 || level > 127) {
-av_log(a->avctx, AV_LOG_WARNING, "Cliping level %d, increase 
qscale\n", level);
+av_log(a->avctx, AV_LOG_WARNING, "Clipping level %d, increase 
qscale\n", level);
 level = av_clip_int8(level);
 }
 asv2_put_bits(pb, 8, level & 0xFF);
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index ca51c97..44f7b61 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2413,7 +2413,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
 s->closed_gop = get_bits1(>gb);
-/* broken_link indicate that after editing the
+/* broken_link indicates that after editing the
  * reference frames of the first B-Frames after GOP I-Frame
  * are missing (open gop) */
 broken_link = get_bits1(>gb);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] tools: fix grammar error

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:56:58 2016 +0200| [f71c98ee12f9a9e950b4a8fb6b1548fee91ba1f8] | committer: 
Michael Niedermayer

tools: fix grammar error

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f71c98ee12f9a9e950b4a8fb6b1548fee91ba1f8
---

 tools/ismindex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ismindex.c b/tools/ismindex.c
index 5917d42..c16e2f2 100644
--- a/tools/ismindex.c
+++ b/tools/ismindex.c
@@ -375,7 +375,7 @@ static int read_tfra(struct Tracks *tracks, int 
start_index, AVIOContext *f)
  track->duration -
  
track->offsets[track->chunks - 1].time;
 }
-// Now try and read the actual durations from the trun sample data.
+// Now try to read the actual durations from the trun sample data.
 for (i = 0; i < track->chunks; i++) {
 int64_t duration = read_moof_duration(f, track->offsets[i].offset);
 if (duration > 0 && llabs(duration - track->offsets[i].duration) > 3) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] cmdutils: fix typos

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Sun Oct  9 
12:57:02 2016 +0200| [3e5d27d7a7350e096eac9f8999d02bf48c3b3a69] | committer: 
Michael Niedermayer

cmdutils: fix typos

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e5d27d7a7350e096eac9f8999d02bf48c3b3a69
---

 cmdutils.c | 4 ++--
 cmdutils.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index 71b3b2f..469c2d5 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -2112,7 +2112,7 @@ static int print_device_sources(AVInputFormat *fmt, 
AVDictionary *opts)
 if (!fmt || !fmt->priv_class  || 
!AV_IS_INPUT_DEVICE(fmt->priv_class->category))
 return AVERROR(EINVAL);
 
-printf("Audo-detected sources for %s:\n", fmt->name);
+printf("Auto-detected sources for %s:\n", fmt->name);
 if (!fmt->get_device_list) {
 ret = AVERROR(ENOSYS);
 printf("Cannot list sources. Not implemented.\n");
@@ -2142,7 +2142,7 @@ static int print_device_sinks(AVOutputFormat *fmt, 
AVDictionary *opts)
 if (!fmt || !fmt->priv_class  || 
!AV_IS_OUTPUT_DEVICE(fmt->priv_class->category))
 return AVERROR(EINVAL);
 
-printf("Audo-detected sinks for %s:\n", fmt->name);
+printf("Auto-detected sinks for %s:\n", fmt->name);
 if (!fmt->get_device_list) {
 ret = AVERROR(ENOSYS);
 printf("Cannot list sinks. Not implemented.\n");
diff --git a/cmdutils.h b/cmdutils.h
index 67bf484..1b96aa4 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -450,13 +450,13 @@ int show_devices(void *optctx, const char *opt, const 
char *arg);
 
 #if CONFIG_AVDEVICE
 /**
- * Print a listing containing audodetected sinks of the output device.
+ * Print a listing containing autodetected sinks of the output device.
  * Device name with options may be passed as an argument to limit results.
  */
 int show_sinks(void *optctx, const char *opt, const char *arg);
 
 /**
- * Print a listing containing audodetected sources of the input device.
+ * Print a listing containing autodetected sources of the input device.
  * Device name with options may be passed as an argument to limit results.
  */
 int show_sources(void *optctx, const char *opt, const char *arg);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg_vaapi: fix choice of decoder_format

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Tue Sep 27 
14:21:49 2016 +0200| [1846a3eac854799fbffc9669dcf4de558b917957] | committer: 
Michael Niedermayer

ffmpeg_vaapi: fix choice of decoder_format

The check could previously never evaluate to true, probably due to
a typo.

Reported-By: Mihai Chindea <mihai.chin...@uti.eu.com>
Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Tested-by: Mark Thompson <s...@jkqxz.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1846a3eac854799fbffc9669dcf4de558b917957
---

 ffmpeg_vaapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg_vaapi.c b/ffmpeg_vaapi.c
index 8090597..f1e7c76 100644
--- a/ffmpeg_vaapi.c
+++ b/ffmpeg_vaapi.c
@@ -302,7 +302,7 @@ static int vaapi_build_decoder_config(VAAPIDecoderContext 
*ctx,
 if (ctx->output_format != AV_PIX_FMT_NONE &&
 ctx->output_format != AV_PIX_FMT_VAAPI) {
 for (i = 0; constraints->valid_sw_formats[i] != AV_PIX_FMT_NONE; i++) {
-if (constraints->valid_sw_formats[i] == ctx->decode_format) {
+if (constraints->valid_sw_formats[i] == ctx->output_format) {
 ctx->decode_format = ctx->output_format;
 av_log(ctx, AV_LOG_DEBUG, "Using decode format %s (output "
"format).\n", av_get_pix_fmt_name(ctx->decode_format));

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc/encoders: minor aac encoder formatting improvements

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Sun Sep 18 
23:51:48 2016 +0200| [2c48014ab2bb6613b79e3c0b6f45daa5333018ae] | committer: 
Rostislav Pehlivanov

doc/encoders: minor aac encoder formatting improvements

Also corrected a line's level.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c48014ab2bb6613b79e3c0b6f45daa5333018ae
---

 doc/encoders.texi | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 321eb2f..73ebd9c 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -61,8 +61,9 @@ Two loop searching (TLS) method.
 
 This method first sets quantizers depending on band thresholds and then tries
 to find an optimal combination by adding or subtracting a specific value from
-all quantizers and adjusting some individual quantizer a little.
-Will tune itself based on whether aac_is/aac_ms/aac_pns are enabled.
+all quantizers and adjusting some individual quantizer a little.  Will tune
+itself based on whether @option{aac_is}, @option{aac_ms} and @option{aac_pns}
+are enabled.
 This is the default choice for a coder.
 
 @item anmr
@@ -84,7 +85,7 @@ Not recommended.
 @end table
 
 @item aac_ms
-Sets mid/side coding mode. The default value of auto will automatically use
+Sets mid/side coding mode. The default value of "auto" will automatically use
 M/S with bands which will benefit from such coding. Can be forced for all bands
 using the value "enable", which is mainly useful for debugging or disabled 
using
 "disable".
@@ -130,19 +131,19 @@ The default, AAC "Low-complexity" profile. Is the most 
compatible and produces
 decent quality.
 
 @item mpeg2_aac_low
-Equivalent to -profile:a aac_low -aac_pns 0. PNS was introduced with the MPEG4
-specifications.
+Equivalent to @code{-profile:a aac_low -aac_pns 0}. PNS was introduced with the
+MPEG4 specifications.
 
 @item aac_ltp
-Long term prediction profile, is enabled by and will enable the aac_ltp option.
-Introduced in MPEG4.
+Long term prediction profile, is enabled by and will enable the 
@option{aac_ltp}
+option. Introduced in MPEG4.
 
 @item aac_main
-Main-type prediction profile, is enabled by and will enable the aac_pred 
option.
-Introduced in MPEG2.
+Main-type prediction profile, is enabled by and will enable the 
@option{aac_pred}
+option. Introduced in MPEG2.
 
-If this option is unspecified it is set to @samp{aac_low}.
 @end table
+If this option is unspecified it is set to @samp{aac_low}.
 @end table
 
 @section ac3 and ac3_fixed

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libavcodec/qsvdec_h2645.c: drop executable permission

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Thu Sep 15 
15:49:38 2016 +0200| [022260271b1786796ec035d86d28b9bf9b177060] | committer: 
Carl Eugen Hoyos

libavcodec/qsvdec_h2645.c: drop executable permission

Accidentally set in b93e2233155e6c1f0a074cad4135a70d9d2934d3.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=022260271b1786796ec035d86d28b9bf9b177060
---

 libavcodec/qsvdec_h2645.c | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c
old mode 100755
new mode 100644

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libavformat/http: add support for content_type option in listen mode

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Wed Aug 10 
21:18:00 2016 +0200| [d14993478cd9d6274f439f3200ea11c63ff8e0fa] | committer: 
Michael Niedermayer

libavformat/http: add support for content_type option in listen mode

Instead of silently ignoring the content_type option in listen mode,
apply its value to the provided "Content-Type:" header.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Reviewed-by: Nicolas George <geo...@nsup.org>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d14993478cd9d6274f439f3200ea11c63ff8e0fa
---

 doc/protocols.texi | 2 +-
 libavformat/http.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 5767e23..470c99c 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -276,7 +276,7 @@ value is -1.
 If set to 1 use chunked Transfer-Encoding for posts, default is 1.
 
 @item content_type
-Set a specific content type for the POST messages.
+Set a specific content type for the POST messages or for listen mode.
 
 @item http_proxy
 set HTTP proxy to tunnel through e.g. http://example.com:1234
diff --git a/libavformat/http.c b/libavformat/http.c
index cb5824f..adb3d92 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -355,7 +355,7 @@ static int http_write_reply(URLContext* h, int status_code)
 case 200:
 reply_code = 200;
 reply_text = "OK";
-content_type = "application/octet-stream";
+content_type = s->content_type ? s->content_type : 
"application/octet-stream";
 break;
 case AVERROR_HTTP_SERVER_ERROR:
 case 500:

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libavformat/http: add support for headers option in listen mode

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Thu Aug 11 
11:29:07 2016 +0200| [e8b355a0288ce8f575cc12cce7e7b7b0dae62525] | committer: 
Michael Niedermayer

libavformat/http: add support for headers option in listen mode

Instead of silently ignoring the headers option in listen mode, use
the provided headers.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8b355a0288ce8f575cc12cce7e7b7b0dae62525
---

 libavformat/http.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index 51275d9..cb5824f 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -371,12 +371,14 @@ static int http_write_reply(URLContext* h, int 
status_code)
  "HTTP/1.1 %03d %s\r\n"
  "Content-Type: %s\r\n"
  "Content-Length: %"SIZE_SPECIFIER"\r\n"
+ "%s"
  "\r\n"
  "%03d %s\r\n",
  reply_code,
  reply_text,
  content_type,
  strlen(reply_text) + 6, // 3 digit status code + space + \r\n
+ s->headers ? s->headers : "",
  reply_code,
  reply_text);
 } else {
@@ -385,10 +387,12 @@ static int http_write_reply(URLContext* h, int 
status_code)
  "HTTP/1.1 %03d %s\r\n"
  "Content-Type: %s\r\n"
  "Transfer-Encoding: chunked\r\n"
+ "%s"
  "\r\n",
  reply_code,
  reply_text,
- content_type);
+ content_type,
+ s->headers ? s->headers : "");
 }
 av_log(h, AV_LOG_TRACE, "HTTP reply header: \n%s\n", message);
 if ((ret = ffurl_write(s->hd, message, message_len)) < 0)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat: add hash and framehash muxers

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Tue Apr 12 
11:16:18 2016 -0300| [f4a0236cbd75249418b40e8aa88b0264c0b58b69] | committer: 
James Almer

avformat: add hash and framehash muxers

Reviewed-by: Michael Niedermayer <mich...@niedermayer.cc>
Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: James Almer <jamr...@gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4a0236cbd75249418b40e8aa88b0264c0b58b69
---

 Changelog   |1 +
 doc/muxers.texi |  125 +--
 libavformat/Makefile|6 +-
 libavformat/allformats.c|2 +
 libavformat/{md5enc.c => hashenc.c} |  140 +--
 libavformat/version.h   |2 +-
 6 files changed, 211 insertions(+), 65 deletions(-)

diff --git a/Changelog b/Changelog
index b4a4dd7..b976dbb 100644
--- a/Changelog
+++ b/Changelog
@@ -22,6 +22,7 @@ version :
 - musx demuxer
 - aix demuxer
 - remap filter
+- hash and framehash muxers
 
 version 3.0:
 - Common Encryption (CENC) MP4 encoding and decoding support
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 2aafbad..042efce 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -174,30 +174,70 @@ ffmpeg -i INPUT -c:a pcm_u8 -c:v mpeg2video -f framecrc -
 
 See also the @ref{crc} muxer.
 
-@anchor{framemd5}
-@section framemd5
+@anchor{framehash}
+@section framehash
 
-Per-packet MD5 testing format.
+Per-packet hash testing format.
 
-This muxer computes and prints the MD5 hash for each audio
-and video packet. By default audio frames are converted to signed
-16-bit raw audio and video frames to raw video before computing the
-hash.
+This muxer computes and prints a cryptographic hash for each audio
+and video packet. This can be used for packet-by-packet equality
+checks without having to individually do a binary comparison on each.
+
+By default audio frames are converted to signed 16-bit raw audio and
+video frames to raw video before computing the hash, but the output
+of explicit conversions to other codecs can also be used. It uses the
+SHA-256 cryptographic hash function by default, but supports several
+other algorithms.
 
 The output of the muxer consists of a line for each audio and video
 packet of the form:
 @example
-@var{stream_index}, @var{packet_dts}, @var{packet_pts}, @var{packet_duration}, 
@var{packet_size}, @var{MD5}
+@var{stream_index}, @var{packet_dts}, @var{packet_pts}, @var{packet_duration}, 
@var{packet_size}, @var{hash}
 @end example
 
-@var{MD5} is a hexadecimal number representing the computed MD5 hash
+@var{hash} is a hexadecimal number representing the computed hash
 for the packet.
 
+@table @option
+@item hash @var{algorithm}
+Use the cryptographic hash function specified by the string @var{algorithm}.
+Supported values include @code{MD5}, @code{murmur3}, @code{RIPEMD128},
+@code{RIPEMD160}, @code{RIPEMD256}, @code{RIPEMD320}, @code{SHA160},
+@code{SHA224}, @code{SHA256} (default), @code{SHA512/224}, @code{SHA512/256},
+@code{SHA384}, @code{SHA512}, @code{CRC32} and @code{adler32}.
+
+@end table
+
 @subsection Examples
 
-For example to compute the MD5 of the audio and video frames in
-@file{INPUT}, converted to raw audio and video packets, and store it
-in the file @file{out.md5}:
+To compute the SHA-256 hash of the audio and video frames in @file{INPUT},
+converted to raw audio and video packets, and store it in the file
+@file{out.sha256}:
+@example
+ffmpeg -i INPUT -f framehash out.sha256
+@end example
+
+To print the information to stdout, using the MD5 hash function, use
+the command:
+@example
+ffmpeg -i INPUT -f framehash -hash md5 -
+@end example
+
+See also the @ref{hash} muxer.
+
+@anchor{framemd5}
+@section framemd5
+
+Per-packet MD5 testing format.
+
+This is a variant of the @ref{framehash} muxer. Unlike that muxer,
+it defaults to using the MD5 hash function.
+
+@subsection Examples
+
+To compute the MD5 hash of the audio and video frames in @file{INPUT},
+converted to raw audio and video packets, and store it in the file
+@file{out.md5}:
 @example
 ffmpeg -i INPUT -f framemd5 out.md5
 @end example
@@ -207,7 +247,7 @@ To print the information to stdout, use the command:
 ffmpeg -i INPUT -f framemd5 -
 @end example
 
-See also the @ref{md5} muxer.
+See also the @ref{framehash} and @ref{md5} muxers.
 
 @anchor{gif}
 @section gif
@@ -243,6 +283,51 @@ ffmpeg -i INPUT -c:v gif -f image2 "out%d.gif"
 Note 2: the GIF format has a very small time base: the delay between two frames
 can not be smaller than one centi second.
 
+@anchor{hash}
+@section hash
+
+Hash testing format.
+
+This muxer computes and prints a cryptographic hash of all the input
+audio and video frames. This can be used for equality checks without
+having to do a complete binary comparison.
+
+By default audio frames are converted to signed 16-bit raw audio and
+video frames to raw video b

[FFmpeg-cvslog] lavf/mp3dec: avoid printing useless message in default log level

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Tue Mar  8 
16:54:42 2016 +0100| [8a90e0fd21f77e81abc1b5abab0eda05cc89f59b] | committer: wm4

lavf/mp3dec: avoid printing useless message in default log level

"Skipping 0 bytes of junk" is useless to the user, and essentially
indicates a NOP. At 0 bytes, this message is now pushed back to
the verbose log level.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a90e0fd21f77e81abc1b5abab0eda05cc89f59b
---

 libavformat/mp3dec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index adc3d2a..672d643 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -388,7 +388,7 @@ static int mp3_read_header(AVFormatContext *s)
 if (ret >= 0 &&
 (header & SAME_HEADER_MASK) == (header2 & SAME_HEADER_MASK))
 {
-av_log(s, AV_LOG_INFO, "Skipping %d bytes of junk at 
%"PRId64".\n", i, off);
+av_log(s, i > 0 ? AV_LOG_INFO : AV_LOG_VERBOSE, "Skipping %d 
bytes of junk at %"PRId64".\n", i, off);
 ret = avio_seek(s->pb, off + i, SEEK_SET);
 if (ret < 0)
 return ret;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc/mjpegdec: avoid printing useless message in default log level

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Tue Mar  8 
15:36:27 2016 +0100| [72babb8566bdc6d50c25267448491ec02ea1bdcc] | committer: 
Michael Niedermayer

lavc/mjpegdec: avoid printing useless message in default log level

The change of bps from 0 doesn't contain any info useful to the
user. This message is now at info log level only if the original
value is !=0, otherwise pushed back to debug log level. The
original value is displayed additionally.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72babb8566bdc6d50c25267448491ec02ea1bdcc
---

 libavcodec/mjpegdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 1e83e88..3e4b6f0 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -282,7 +282,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
 }
 
 if (s->avctx->bits_per_raw_sample != bits) {
-av_log(s->avctx, AV_LOG_INFO, "Changing bps to %d\n", bits);
+av_log(s->avctx, s->avctx->bits_per_raw_sample > 0 ? AV_LOG_INFO : 
AV_LOG_DEBUG, "Changing bps from %d to %d\n", s->avctx->bits_per_raw_sample, 
bits);
 s->avctx->bits_per_raw_sample = bits;
 init_idct(s->avctx);
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavf/options_table: mark use_wallclock_as_timestamps as boolean

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Thu Feb 18 
14:47:10 2016 +0100| [6eaad752c1c6d854af881f813ae5a414d4d336f1] | committer: 
Michael Niedermayer

lavf/options_table: mark use_wallclock_as_timestamps as boolean

It is only used in a boolean context. Also clarify its documentation.

Signed-off-by: Moritz Barsnick <barsn...@gmx.net>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6eaad752c1c6d854af881f813ae5a414d4d336f1
---

 doc/formats.texi|2 +-
 libavformat/options_table.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/formats.texi b/doc/formats.texi
index 617cda5..f79ebe2 100644
--- a/doc/formats.texi
+++ b/doc/formats.texi
@@ -147,7 +147,7 @@ a packet for each stream, regardless of the maximum 
timestamp
 difference between the buffered packets.
 
 @item use_wallclock_as_timestamps @var{integer} (@emph{input})
-Use wallclock as timestamps.
+Use wallclock as timestamps if set to 1. Default is 0.
 
 @item avoid_negative_ts @var{integer} (@emph{output})
 
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index 8926fe5..74923d8 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -78,7 +78,7 @@ static const AVOption avformat_options[] = {
 {"careful","consider things that violate the spec, are fast to check and 
have not been seen in the wild as errors", 0, AV_OPT_TYPE_CONST, {.i64 = 
AV_EF_CAREFUL }, INT_MIN, INT_MAX, D, "err_detect"},
 {"compliant",  "consider all spec non compliancies as errors", 0, 
AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT }, INT_MIN, INT_MAX, D, 
"err_detect"},
 {"aggressive", "consider things that a sane encoder shouldn't do as an error", 
0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE }, INT_MIN, INT_MAX, D, 
"err_detect"},
-{"use_wallclock_as_timestamps", "use wallclock as timestamps", 
OFFSET(use_wallclock_as_timestamps), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, 
D},
+{"use_wallclock_as_timestamps", "use wallclock as timestamps", 
OFFSET(use_wallclock_as_timestamps), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, D},
 {"skip_initial_bytes", "set number of bytes to skip before reading header and 
frames", OFFSET(skip_initial_bytes), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, 
INT64_MAX-1, D},
 {"correct_ts_overflow", "correct single timestamp overflows", 
OFFSET(correct_ts_overflow), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, D},
 {"flush_packets", "enable flushing of the I/O context after each packet", 
OFFSET(flush_packets), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, E},

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg: add progress speed to status line and report

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Fri Dec 11 
16:49:14 2015 +0100| [9d1fb9ef313e0fb709ac4c35c7bf00264963fd85] | committer: 
Michael Niedermayer

ffmpeg: add progress speed to status line and report

This adds a computation of the progress speed versus realtime ("Nx")
to the status line and to the report log. It uses the progress time
as already calculated for total output time as a base.

Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d1fb9ef313e0fb709ac4c35c7bf00264963fd85
---

 ffmpeg.c |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 6ff45d9..a3c8922 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1533,10 +1533,12 @@ static void print_report(int is_last_report, int64_t 
timer_start, int64_t cur_ti
 AVCodecContext *enc;
 int frame_number, vid, i;
 double bitrate;
+double speed;
 int64_t pts = INT64_MIN + 1;
 static int64_t last_time = -1;
 static int qp_histogram[52];
 int hours, mins, secs, us;
+float t;
 
 if (!print_stats && !is_last_report && !progress_avio)
 return;
@@ -1551,6 +1553,8 @@ static void print_report(int is_last_report, int64_t 
timer_start, int64_t cur_ti
 last_time = cur_time;
 }
 
+t = (cur_time-timer_start) / 100.0;
+
 
 oc = output_files[0]->ctx;
 
@@ -1574,7 +1578,7 @@ static void print_report(int is_last_report, int64_t 
timer_start, int64_t cur_ti
ost->file_index, ost->index, q);
 }
 if (!vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) {
-float fps, t = (cur_time-timer_start) / 100.0;
+float fps;
 
 frame_number = ost->frame_number;
 fps = t > 1 ? frame_number / t : 0;
@@ -1642,6 +1646,7 @@ static void print_report(int is_last_report, int64_t 
timer_start, int64_t cur_ti
 mins %= 60;
 
 bitrate = pts && total_size >= 0 ? total_size * 8 / (pts / 1000.0) : -1;
+speed = t != 0.0 ? (double)pts / AV_TIME_BASE / t : -1;
 
 if (total_size < 0) snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
  "size=N/A time=");
@@ -1673,6 +1678,14 @@ static void print_report(int is_last_report, int64_t 
timer_start, int64_t cur_ti
 av_bprintf(_script, "dup_frames=%d\n", nb_frames_dup);
 av_bprintf(_script, "drop_frames=%d\n", nb_frames_drop);
 
+if (speed < 0) {
+snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf)," speed=N/A");
+av_bprintf(_script, "speed=N/A\n");
+} else {
+snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf)," speed=%4.3gx", 
speed);
+av_bprintf(_script, "speed=%4.3gx\n", speed);
+}
+
 if (print_stats || is_last_report) {
 const char end = is_last_report ? '\n' : '\r';
 if (print_stats==1 && AV_LOG_INFO > av_log_get_level()) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: use use_pkg_config() instead of check_pkg_config() for libsmbclient

[Moritz Barsnick]

ffmpeg | branch: release/2.5 | Moritz Barsnick barsn...@gmx.net | Mon Dec  8 
16:08:20 2014 +0100| [d5af3fb1c53e55654f409904a3491e77db02fa5a] | committer: 
Michael Niedermayer

configure: use use_pkg_config() instead of check_pkg_config() for libsmbclient

This ensures that the CFLAGS and LDFLAGS are actually applied.
Fixes an incorrect change introduced with the clean-up in commit
cfcaf6b38e39ed6e788abb1a5a44f23660dce2f6.

Reviewed-by: Nicolas George geo...@nsup.org
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 754f4957d7a7e5be0df0e9de1d31aebeecdc4476)

Signed-off-by: Michael Niedermayer michae...@gmx.at

 http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5af3fb1c53e55654f409904a3491e77db02fa5a
---

 configure |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index c046e34..ed50628 100755
--- a/configure
+++ b/configure
@@ -4883,7 +4883,7 @@ enabled libquvirequire_pkg_config libquvi 
quvi/quvi.h quvi_init
 enabled librtmprequire_pkg_config librtmp librtmp/rtmp.h 
RTMP_Socket
 enabled libschroedingerrequire_pkg_config schroedinger-1.0 
schroedinger/schro.h schro_init
 enabled libshine   require_pkg_config shine shine/layer3.h 
shine_encode_buffer
-enabled libsmbclient   { check_pkg_config smbclient libsmbclient.h 
smbc_init ||
+enabled libsmbclient   { use_pkg_config smbclient libsmbclient.h 
smbc_init ||
require smbclient libsmbclient.h smbc_init 
-lsmbclient; }
 enabled libsoxrrequire libsoxr soxr.h soxr_create -lsoxr
 enabled libssh require_pkg_config libssh libssh/sftp.h sftp_init

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc/filters.texi: fix several typos in the vidstab* sections

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick barsn...@gmx.net | Wed Oct 15 
15:44:33 2014 +0200| [bbd8c85263207a61108f53037829ef94a7086bd8] | committer: 
Michael Niedermayer

doc/filters.texi: fix several typos in the vidstab* sections

Also create an anchor for the unsharp filter, and references to
it in its mentions.

Signed-off-by: Michael Niedermayer michae...@gmx.at

 http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bbd8c85263207a61108f53037829ef94a7086bd8
---

 doc/filters.texi |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index e9c1a24..1aefd6e 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -8651,6 +8651,7 @@ ffmpeg -i INPUT -vf trim=duration=1
 @end itemize
 
 
+@anchor{unsharp}
 @section unsharp
 
 Sharpen or blur the input video.
@@ -8812,7 +8813,7 @@ Read a file with transform information for each frame and
 apply/compensate them. Together with the @ref{vidstabdetect}
 filter this can be used to deshake videos. See also
 @url{http://public.hronopik.de/vid.stab}. It is important to also use
-the unsharp filter, see below.
+the @ref{unsharp} filter, see below.
 
 To enable compilation of this filter you need to configure FFmpeg with
 @code{--enable-libvidstab}.
@@ -8822,7 +8823,7 @@ To enable compilation of this filter you need to 
configure FFmpeg with
 @table @option
 @item input
 Set path to the file used to read the transforms. Default value is
-@file{transforms.trf}).
+@file{transforms.trf}.
 
 @item smoothing
 Set the number of frames (value*2 + 1) used for lowpass filtering the
@@ -8830,9 +8831,9 @@ camera movements. Default value is 10.
 
 For example a number of 10 means that 21 frames are used (10 in the
 past and 10 in the future) to smoothen the motion in the video. A
-larger values leads to a smoother video, but limits the acceleration
-of the camera (pan/tilt movements). 0 is a special case where a
-static camera is simulated.
+larger value leads to a smoother video, but limits the acceleration of
+the camera (pan/tilt movements). 0 is a special case where a static
+camera is simulated.
 
 @item optalgo
 Set the camera path optimization algorithm.
@@ -8869,7 +8870,7 @@ fill the border black
 Invert transforms if set to 1. Default value is 0.
 
 @item relative
-Consider transforms as relative to previsou frame if set to 1,
+Consider transforms as relative to previous frame if set to 1,
 absolute if set to 0. Default value is 0.
 
 @item zoom
@@ -8935,7 +8936,7 @@ Use @command{ffmpeg} for a typical stabilization with 
default values:
 ffmpeg -i inp.mpeg -vf vidstabtransform,unsharp=5:5:0.8:3:3:0.4 
inp_stabilized.mpeg
 @end example
 
-Note the use of the unsharp filter which is always recommended.
+Note the use of the @ref{unsharp} filter which is always recommended.
 
 @item
 Zoom in a bit more and load transform data from a given file:

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] align and correct messages regarding bitstream filters

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick barsn...@gmx.net | Tue Aug 19 
14:28:35 2014 +0200| [66d02d3ca626664b7cdaf9b21a44b130959c6c24] | committer: 
Michael Niedermayer

align and correct messages regarding bitstream filters

The messages regarding the recommended use of bitstream filters are somewhat 
different.
This also adds the :v stream specifier to -bsf h264_mp4toannexb.

Signed-off-by: Michael Niedermayer michae...@gmx.at

 http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66d02d3ca626664b7cdaf9b21a44b130959c6c24
---

 libavformat/flvenc.c|2 +-
 libavformat/movenc.c|2 +-
 libavformat/mpegtsenc.c |3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index dd74d4c..febc5e5 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -521,7 +521,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket 
*pkt)
(AV_RB16(pkt-data)  0xfff0) == 0xfff0) {
 if (!s-streams[pkt-stream_index]-nb_frames) {
 av_log(s, AV_LOG_ERROR, Malformed AAC bitstream detected: 
-   use audio bitstream filter 'aac_adtstoasc' to fix it 
+   use the audio bitstream filter 'aac_adtstoasc' to fix it 
('-bsf:a aac_adtstoasc' option with ffmpeg)\n);
 return AVERROR_INVALIDDATA;
 }
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 2b801b7..bf61391 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3517,7 +3517,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
 (AV_RB16(pkt-data)  0xfff0) == 0xfff0) {
 if (!s-streams[pkt-stream_index]-nb_frames) {
 av_log(s, AV_LOG_ERROR, Malformed AAC bitstream detected: 
-   use audio bitstream filter 'aac_adtstoasc' to fix it 
+   use the audio bitstream filter 'aac_adtstoasc' to fix it 
('-bsf:a aac_adtstoasc' option with ffmpeg)\n);
 return -1;
 }
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 208360f..0184d87 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1193,7 +1193,8 @@ int ff_check_h264_startcode(AVFormatContext *s, const 
AVStream *st, const AVPack
 if (pkt-size  5 || AV_RB32(pkt-data) != 0x001) {
 if (!st-nb_frames) {
 av_log(s, AV_LOG_ERROR, H.264 bitstream malformed, 
-   no startcode found, use the h264_mp4toannexb bitstream 
filter (-bsf h264_mp4toannexb)\n);
+   no startcode found, use the video bitstream filter 
'h264_mp4toannexb' to fix it 
+   ('-bsf:v h264_mp4toannexb' option with ffmpeg)\n);
 return AVERROR_INVALIDDATA;
 }
 av_log(s, AV_LOG_WARNING, H.264 bitstream error, startcode 
missing\n);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog