[FFmpeg-cvslog] aacenc: add description to the 'aac_coder' option
ffmpeg | branch: master | Rostislav Pehlivanov | Sat Aug
1 17:40:30 2015 +0100| [ec2090d21f54f3f9434e928816081e0e9fcb4fa5] | committer:
Rostislav Pehlivanov
aacenc: add description to the 'aac_coder' option
This commit adds a short description to the aac_coder option of the
AAC encoder in order to be consistent with the other options.
Generally, right now, the 'FAAC' method works fine with speech and
low broadband spectrum audio. 'Fast' is just as the name suggests.
'ANMR' still needs work and 'Twoloop', the default, works well with
every type of audio.
Signed-off-by: Rostislav Pehlivanov
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec2090d21f54f3f9434e928816081e0e9fcb4fa5
---
libavcodec/aacenc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 152203f..0d84a82 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -905,7 +905,7 @@ static const AVOption aacenc_options[] = {
{"auto", "Selected by the Encoder", 0, AV_OPT_TYPE_CONST, {.i64 =
-1 }, INT_MIN, INT_MAX, AACENC_FLAGS, "stereo_mode"},
{"ms_off", "Disable Mid/Side coding", 0, AV_OPT_TYPE_CONST, {.i64 =
0 }, INT_MIN, INT_MAX, AACENC_FLAGS, "stereo_mode"},
{"ms_force", "Force Mid/Side for the whole frame if possible", 0,
AV_OPT_TYPE_CONST, {.i64 = 1 }, INT_MIN, INT_MAX, AACENC_FLAGS, "stereo_mode"},
-{"aac_coder", "", offsetof(AACEncContext, options.aac_coder),
AV_OPT_TYPE_INT, {.i64 = AAC_CODER_TWOLOOP}, 0, AAC_CODER_NB-1, AACENC_FLAGS,
"aac_coder"},
+{"aac_coder", "Coding algorithm", offsetof(AACEncContext,
options.aac_coder), AV_OPT_TYPE_INT, {.i64 = AAC_CODER_TWOLOOP}, 0,
AAC_CODER_NB-1, AACENC_FLAGS, "aac_coder"},
{"faac", "FAAC-inspired method", 0, AV_OPT_TYPE_CONST, {.i64
= AAC_CODER_FAAC},INT_MIN, INT_MAX, AACENC_FLAGS, "aac_coder"},
{"anmr", "ANMR method", 0, AV_OPT_TYPE_CONST, {.i64
= AAC_CODER_ANMR},INT_MIN, INT_MAX, AACENC_FLAGS, "aac_coder"},
{"twoloop", "Two loop searching method", 0, AV_OPT_TYPE_CONST, {.i64
= AAC_CODER_TWOLOOP}, INT_MIN, INT_MAX, AACENC_FLAGS, "aac_coder"},
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/avf_showvolume: stop making output fully transparent
ffmpeg | branch: master | Paul B Mahol | Sat Aug 1 19:36:10
2015 +0200| [5bf8590d6e76c57676611036c4dd9ddbcaec0cce] | committer: Paul B Mahol
avfilter/avf_showvolume: stop making output fully transparent
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bf8590d6e76c57676611036c4dd9ddbcaec0cce
---
libavfilter/avf_showvolume.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavfilter/avf_showvolume.c b/libavfilter/avf_showvolume.c
index 19dcc84..24f3c14 100644
--- a/libavfilter/avf_showvolume.c
+++ b/libavfilter/avf_showvolume.c
@@ -52,7 +52,7 @@ static const AVOption showvolume_options[] = {
{ "w", "set channel width", OFFSET(w), AV_OPT_TYPE_INT, {.i64=400}, 40,
1080, FLAGS },
{ "h", "set channel height", OFFSET(h), AV_OPT_TYPE_INT, {.i64=20}, 1,
100, FLAGS },
{ "f", "set fade", OFFSET(f), AV_OPT_TYPE_INT, {.i64=20}, 1,
255, FLAGS },
-{ "c", "set volume color expression", OFFSET(color), AV_OPT_TYPE_STRING,
{.str="if(gte(VOLUME,-2), if(gte(VOLUME,-1),0xff, 0x),0xff00)"}, 0, 0,
FLAGS },
+{ "c", "set volume color expression", OFFSET(color), AV_OPT_TYPE_STRING,
{.str="if(gte(VOLUME,-2), if(gte(VOLUME,-1),0xffff,
0xff00),0xff00ff00)"}, 0, 0, FLAGS },
{ "t", "display channel names", OFFSET(draw_text), AV_OPT_TYPE_INT,
{.i64=1}, 0, 1, FLAGS },
{ NULL }
};
@@ -194,7 +194,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame
*insamples)
for (c = 0; c < inlink->channels; c++) {
float *src = (float *)insamples->extended_data[c];
float max = 0;
-int color;
+uint32_t color;
for (i = 0; i < insamples->nb_samples; i++)
max = FFMAX(max, src[i]);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. bc8d1d7 Add statement regarding resignation of Michael Niedermayer as leader
The branch, master has been updated via bc8d1d7ccf59417b87954c3b02a95e6b61c2ad2c (commit) from 042421572f608a52bcc4d05de40ed60577b2394d (commit) - Log - commit bc8d1d7ccf59417b87954c3b02a95e6b61c2ad2c Author: Kieran Kunhya AuthorDate: Sat Aug 1 22:45:18 2015 +0100 Commit: Kieran Kunhya CommitDate: Sat Aug 1 22:45:18 2015 +0100 Add statement regarding resignation of Michael Niedermayer as leader diff --git a/src/index b/src/index index 8d7fe33..934582f 100644 --- a/src/index +++ b/src/index @@ -37,6 +37,21 @@ News + August 1st, 2015, A message from the FFmpeg project + +Dear multimedia community, + + +The resignation of Michael Niedermayer as leader of FFmpeg yesterday has come as a shock. He has worked tirelessly on the FFmpeg project for many years and we must thank him for the work that he has done. We hope that in the future he will be able to continue to contribute to the project. In the coming weeks, the FFmpeg project will be managed by the active contributors, until we can find a more permanent solution. + + +The last four years have not been easy on our multimedia community, for both contributors and users. The current situation gives us an opportunity to find solutions to these issues, and to have reconciliation between the forks, which have split the community for so long. + +Unfortunately, much of the disagreement has taken place in inappropriate venues so far, which has made finding common ground and solutions difficult. We aim to discuss this in our communities online over the coming weeks, and in person at the https://www.videolan.org/videolan/events/vdd15/";>VideoLAN Developer Days in Paris in September: a neutral venue for the entire open source multimedia community. + +The FFmpeg project. + + July 4th, 2015, FFmpeg needs a new host After graciously hosting our projects (http://www.ffmpeg.org";>FFmpeg, http://www.mplayerhq.hu";>MPlayer --- Summary of changes: src/index | 15 +++ 1 file changed, 15 insertions(+) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. db8ebaf Fix html errors
The branch, master has been updated via db8ebafaa040cf80b136b9bc457dfad399eb1484 (commit) from bc8d1d7ccf59417b87954c3b02a95e6b61c2ad2c (commit) - Log - commit db8ebafaa040cf80b136b9bc457dfad399eb1484 Author: Kieran Kunhya AuthorDate: Sat Aug 1 22:55:39 2015 +0100 Commit: Kieran Kunhya CommitDate: Sat Aug 1 22:55:39 2015 +0100 Fix html errors diff --git a/src/index b/src/index index 934582f..74529a9 100644 --- a/src/index +++ b/src/index @@ -46,8 +46,10 @@ The last four years have not been easy on our multimedia community, for both contributors and users. The current situation gives us an opportunity to find solutions to these issues, and to have reconciliation between the forks, which have split the community for so long. + Unfortunately, much of the disagreement has taken place in inappropriate venues so far, which has made finding common ground and solutions difficult. We aim to discuss this in our communities online over the coming weeks, and in person at the https://www.videolan.org/videolan/events/vdd15/";>VideoLAN Developer Days in Paris in September: a neutral venue for the entire open source multimedia community. + The FFmpeg project. --- Summary of changes: src/index | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. c02a717 Fix stray
The branch, master has been updated via c02a717c36d620756230d72b8389186c638b2b33 (commit) from db8ebafaa040cf80b136b9bc457dfad399eb1484 (commit) - Log - commit c02a717c36d620756230d72b8389186c638b2b33 Author: Kieran Kunhya AuthorDate: Sat Aug 1 23:11:35 2015 +0100 Commit: Kieran Kunhya CommitDate: Sat Aug 1 23:11:35 2015 +0100 Fix stray diff --git a/src/index b/src/index index 74529a9..ec6a6f0 100644 --- a/src/index +++ b/src/index @@ -45,7 +45,7 @@ The resignation of Michael Niedermayer as leader of FFmpeg yesterday has come as a shock. He has worked tirelessly on the FFmpeg project for many years and we must thank him for the work that he has done. We hope that in the future he will be able to continue to contribute to the project. In the coming weeks, the FFmpeg project will be managed by the active contributors, until we can find a more permanent solution. -The last four years have not been easy on our multimedia community, for both contributors and users. The current situation gives us an opportunity to find solutions to these issues, and to have reconciliation between the forks, which have split the community for so long. +The last four years have not been easy on our multimedia community, for both contributors and users. The current situation gives us an opportunity to find solutions to these issues, and to have reconciliation between the forks, which have split the community for so long. Unfortunately, much of the disagreement has taken place in inappropriate venues so far, which has made finding common ground and solutions difficult. We aim to discuss this in our communities online over the coming weeks, and in person at the https://www.videolan.org/videolan/events/vdd15/";>VideoLAN Developer Days in Paris in September: a neutral venue for the entire open source multimedia community. --- Summary of changes: src/index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. c25425b news: remove the recent added message
The branch, master has been updated via c25425bfc7ddef665ece21ed9374bc297bba02db (commit) from c02a717c36d620756230d72b8389186c638b2b33 (commit) - Log - commit c25425bfc7ddef665ece21ed9374bc297bba02db Author: Clément BÅsch AuthorDate: Sun Aug 2 00:26:13 2015 +0200 Commit: Clément BÅsch CommitDate: Sun Aug 2 00:26:22 2015 +0200 news: remove the recent added message This news is important but needs at least rewording and proper review. diff --git a/src/index b/src/index index ec6a6f0..8d7fe33 100644 --- a/src/index +++ b/src/index @@ -37,23 +37,6 @@ News - August 1st, 2015, A message from the FFmpeg project - -Dear multimedia community, - - -The resignation of Michael Niedermayer as leader of FFmpeg yesterday has come as a shock. He has worked tirelessly on the FFmpeg project for many years and we must thank him for the work that he has done. We hope that in the future he will be able to continue to contribute to the project. In the coming weeks, the FFmpeg project will be managed by the active contributors, until we can find a more permanent solution. - - -The last four years have not been easy on our multimedia community, for both contributors and users. The current situation gives us an opportunity to find solutions to these issues, and to have reconciliation between the forks, which have split the community for so long. - - -Unfortunately, much of the disagreement has taken place in inappropriate venues so far, which has made finding common ground and solutions difficult. We aim to discuss this in our communities online over the coming weeks, and in person at the https://www.videolan.org/videolan/events/vdd15/";>VideoLAN Developer Days in Paris in September: a neutral venue for the entire open source multimedia community. - - -The FFmpeg project. - - July 4th, 2015, FFmpeg needs a new host After graciously hosting our projects (http://www.ffmpeg.org";>FFmpeg, http://www.mplayerhq.hu";>MPlayer --- Summary of changes: src/index | 17 - 1 file changed, 17 deletions(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 636d63b news: submit reworded announcement
The branch, master has been updated via 636d63b6f3b0ae4b9d0ad5d0c0126b4eeda5db5c (commit) from c25425bfc7ddef665ece21ed9374bc297bba02db (commit) - Log - commit 636d63b6f3b0ae4b9d0ad5d0c0126b4eeda5db5c Author: Kieran Kunhya AuthorDate: Sun Aug 2 00:49:36 2015 +0200 Commit: Clément BÅsch CommitDate: Sun Aug 2 01:10:35 2015 +0200 news: submit reworded announcement Signed-off-by: Lydia Pintscher diff --git a/src/index b/src/index index 8d7fe33..a93f060 100644 --- a/src/index +++ b/src/index @@ -37,6 +37,36 @@ News + August 1st, 2015, A message from the FFmpeg project + +Dear multimedia community, + + +The resignation of Michael Niedermayer as leader of FFmpeg yesterday has +come by surprise. He has worked tirelessly on the FFmpeg project for many +years and we must thank him for the work that he has done. We hope that in +the future he will continue to contribute to the project. In the coming +weeks, the FFmpeg project is managed by the active contributors. + + +The last four years have not been easy for our multimedia community - both +contributors and users. We should now look to the future, try to find +solutions to these issues, and to have reconciliation between the forks, +which have split the community for so long. + + +Unfortunately, much of the disagreement has taken place in inappropriate +venues so far, which has made finding common ground and solutions +difficult. We aim to discuss this in our communities online over the coming +weeks, and in person at the https://www.videolan.org/videolan/events/vdd15/";>VideoLAN Developer +Days in Paris in September: a neutral venue for the entire open source +multimedia community. + + +The FFmpeg project. + + July 4th, 2015, FFmpeg needs a new host After graciously hosting our projects (http://www.ffmpeg.org";>FFmpeg, http://www.mplayerhq.hu";>MPlayer --- Summary of changes: src/index | 30 ++ 1 file changed, 30 insertions(+) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 44f4b5d News: Minor grammar change
The branch, master has been updated via 44f4b5d7a8d5a99ff7377e27e50ab236470c7514 (commit) from 636d63b6f3b0ae4b9d0ad5d0c0126b4eeda5db5c (commit) - Log - commit 44f4b5d7a8d5a99ff7377e27e50ab236470c7514 Author: Kieran Kunhya AuthorDate: Sun Aug 2 00:24:08 2015 +0100 Commit: Kieran Kunhya CommitDate: Sun Aug 2 00:24:08 2015 +0100 News: Minor grammar change diff --git a/src/index b/src/index index a93f060..884edfd 100644 --- a/src/index +++ b/src/index @@ -46,7 +46,7 @@ come by surprise. He has worked tirelessly on the FFmpeg project for many years and we must thank him for the work that he has done. We hope that in the future he will continue to contribute to the project. In the coming -weeks, the FFmpeg project is managed by the active contributors. +weeks, the FFmpeg project will be managed by the active contributors. The last four years have not been easy for our multimedia community - both --- Summary of changes: src/index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. b598b2d Update about servers
The branch, master has been updated via b598b2d9614adda23206711b8e4f8b708b5d567d (commit) from 44f4b5d7a8d5a99ff7377e27e50ab236470c7514 (commit) - Log - commit b598b2d9614adda23206711b8e4f8b708b5d567d Author: Michael Niedermayer AuthorDate: Sun Aug 2 01:39:55 2015 +0200 Commit: Michael Niedermayer CommitDate: Sun Aug 2 01:47:08 2015 +0200 Update about servers Signed-off-by: Michael Niedermayer diff --git a/src/index b/src/index index 884edfd..d5c3106 100644 --- a/src/index +++ b/src/index @@ -68,6 +68,7 @@ July 4th, 2015, FFmpeg needs a new host + UPDATE: We have received more than 7 offers for hosting and servers, thanks a lot to everyone! After graciously hosting our projects (http://www.ffmpeg.org";>FFmpeg, http://www.mplayerhq.hu";>MPlayer and http://rtmpdump.mplayerhq.hu";>rtmpdump) for 4 years, Arpi (our hoster) has informed us that we have to secure a new host somewhere else immediately. --- Summary of changes: src/index | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/mov: fix regression in processing .aax files
ffmpeg | branch: master | Vesselin Bontchev |
Fri Jul 31 12:16:08 2015 +0200| [336822edf4fc0bb7d29570a2b611e2137daa9430] |
committer: Michael Niedermayer
avformat/mov: fix regression in processing .aax files
Commit 0a551cbe introduced "activation_bytes" option, and not specifying
this option (while calling ffmpeg / ffprobe) causes the program to quit
early. Before this commit, ffprobe was capable of processing metadata in
.aax files.
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=336822edf4fc0bb7d29570a2b611e2137daa9430
---
libavformat/mov.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index fdba34c..154d2f8 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -848,9 +848,9 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
av_log(c->fc, AV_LOG_INFO, "\n");
/* verify activation data */
-if (!activation_bytes || c->activation_bytes_size != 4) {
-av_log(c->fc, AV_LOG_FATAL, "[aax] activation_bytes option is
missing!\n");
-ret = AVERROR(EINVAL);
+if (!activation_bytes) {
+av_log(c->fc, AV_LOG_WARNING, "[aax] activation_bytes option is
missing!\n");
+ret = 0; /* allow ffprobe to continue working on .aax files */
goto fail;
}
if (c->activation_bytes_size != 4) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc_mp4toannexb_bsf: Remove ;;
ffmpeg | branch: master | Michael Niedermayer | Sun Aug 2 03:52:37 2015 +0200| [f080a01fd3019f9b1dc5986f688ec7dc83c4bfa5] | committer: Michael Niedermayer avcodec/hevc_mp4toannexb_bsf: Remove ;; Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f080a01fd3019f9b1dc5986f688ec7dc83c4bfa5 --- libavcodec/hevc_mp4toannexb_bsf.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c index 7df5108..54d6d79 100644 --- a/libavcodec/hevc_mp4toannexb_bsf.c +++ b/libavcodec/hevc_mp4toannexb_bsf.c @@ -56,7 +56,7 @@ static int hevc_extradata_to_annexb(HEVCBSFContext* ctx, AVCodecContext *avctx) int ret = 0; uint8_t *new_extradata = NULL; -size_t new_extradata_size = 0;; +size_t new_extradata_size = 0; bytestream2_init(&gb, avctx->extradata, avctx->extradata_size); ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
