[FFmpeg-cvslog] webmdashenc: Add better error handling
ffmpeg | branch: master | Vignesh Venkatasubramanian |
Thu Apr 16 17:32:21 2015 -0700| [1c37848f9029985d1271da9a0d161c2ebf0aca81] |
committer: Michael Niedermayer
webmdashenc: Add better error handling
Return appropriate error codes and propagate the error codes from
helper functions to the outer calls. Also fix a potential leak in
call to av_realloc.
Signed-off-by: Vignesh Venkatasubramanian
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c37848f9029985d1271da9a0d161c2ebf0aca81
---
libavformat/webmdashenc.c | 55 ++---
1 file changed, 37 insertions(+), 18 deletions(-)
diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c
index c5d7158..a8eb8ac 100644
--- a/libavformat/webmdashenc.c
+++ b/libavformat/webmdashenc.c
@@ -179,7 +179,7 @@ static int write_representation(AVFormatContext *s,
AVStream *stream, char *id,
AVDictionaryEntry *bandwidth = av_dict_get(stream->metadata, BANDWIDTH,
NULL, 0);
if ((w->is_live && (!filename)) ||
(!w->is_live && (!irange || !cues_start || !cues_end || !filename ||
!bandwidth))) {
-return -1;
+return AVERROR_INVALIDDATA;
}
avio_printf(s->pb, "priv_data;
+int i;
+for (i = 0; i < w->nb_as; i++) {
+av_freep(&w->as[i].streams);
+}
+av_freep(&w->as);
+w->nb_as = 0;
+}
+
/*
* Parses a live header filename and computes the representation id,
* initialization pattern and the media pattern. Pass NULL if you don't want to
@@ -274,9 +284,9 @@ static int parse_filename(char *filename, char
**representation_id,
underscore_pos = temp_pos + 1;
temp_pos = av_stristr(temp_pos + 1, "_");
}
-if (!underscore_pos) return -1;
+if (!underscore_pos) return AVERROR_INVALIDDATA;
period_pos = av_stristr(underscore_pos, ".");
-if (!period_pos) return -1;
+if (!period_pos) return AVERROR_INVALIDDATA;
*(underscore_pos - 1) = 0;
if (representation_id) {
*representation_id = av_malloc(period_pos - underscore_pos + 1);
@@ -373,19 +383,22 @@ static int write_adaptation_set(AVFormatContext *s, int
as_index)
for (i = 0; i < as->nb_streams; i++) {
char *representation_id = NULL;
+int ret;
if (w->is_live) {
AVDictionaryEntry *filename =
av_dict_get(s->streams[as->streams[i]]->metadata, FILENAME,
NULL, 0);
if (!filename ||
-parse_filename(filename->value, &representation_id, NULL,
NULL)) {
-return -1;
+(ret = parse_filename(filename->value, &representation_id,
NULL, NULL))) {
+return ret;
}
} else {
representation_id = av_asprintf("%d", w->representation_id++);
-if (!representation_id) return -1;
+if (!representation_id) return AVERROR(ENOMEM);
}
-write_representation(s, s->streams[as->streams[i]], representation_id,
- !width_in_as, !height_in_as, !sample_rate_in_as);
+ret = write_representation(s, s->streams[as->streams[i]],
+ representation_id, !width_in_as,
+ !height_in_as, !sample_rate_in_as);
+if (ret) return ret;
av_free(representation_id);
}
avio_printf(s->pb, "\n");
@@ -416,9 +429,11 @@ static int parse_adaptation_sets(AVFormatContext *s)
if (*p == ' ')
continue;
else if (state == new_set && !strncmp(p, "id=", 3)) {
-w->as = av_realloc(w->as, sizeof(*w->as) * ++w->nb_as);
-if (w->as == NULL)
+void *mem = av_realloc(w->as, sizeof(*w->as) * (w->nb_as + 1));
+if (mem == NULL)
return AVERROR(ENOMEM);
+w->as = mem;
+++w->nb_as;
w->as[w->nb_as - 1].nb_streams = 0;
w->as[w->nb_as - 1].streams = NULL;
p += 3; // consume "id="
@@ -453,8 +468,13 @@ static int webm_dash_manifest_write_header(AVFormatContext
*s)
{
int i;
double start = 0.0;
+int ret;
WebMDashMuxContext *w = s->priv_data;
-parse_adaptation_sets(s);
+ret = parse_adaptation_sets(s);
+if (ret < 0) {
+free_adaptation_sets(s);
+return ret;
+}
write_header(s);
avio_printf(s->pb, "pb, " start=\"PT%gS\"", start);
@@ -464,7 +484,11 @@ static int webm_dash_manifest_write_header(AVFormatContext
*s)
avio_printf(s->pb, " >\n");
for (i = 0; i < w->nb_as; i++) {
-if (write_adaptation_set(s, i) < 0) return -1;
+ret = write_adaptation_set(s, i);
+if (ret < 0) {
+free_adaptation_sets(s);
+return ret;
+}
}
avio_printf(s->pb, "\n");
@@ -479,12 +503,7 @@ static int webm_dash_manifest_write_packet(AVFormatContext
*s, AVPacket *pkt)
static int webm_dash_manifest_write_trailer
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 7d671fb Remove www. from the OS X download URL
The branch, master has been updated via 7d671fba3f3b13c325a3c6e83618e657170ef617 (commit) from 02e8a22bc32a6891c649f15f27d5562fcbdda99b (commit) - Log - commit 7d671fba3f3b13c325a3c6e83618e657170ef617 Author: Helmut K. C. Tessarek AuthorDate: Thu Apr 16 17:31:54 2015 -0700 Commit: Timothy Gu CommitDate: Thu Apr 16 17:31:54 2015 -0700 Remove www. from the OS X download URL diff --git a/src/download b/src/download index a9d5cc2..7d50786 100644 --- a/src/download +++ b/src/download @@ -89,7 +89,7 @@ OS X Packages - http://www.evermeet.cx/ffmpeg/";> + http://evermeet.cx/ffmpeg/";> Static builds for OS X Intel 64-bit http://ffmpegmac.net/";> --- Summary of changes: src/download |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: remove old libdcadec check
ffmpeg | branch: master | James Almer | Thu Apr 16 20:04:57
2015 -0300| [8254011b217356915fb49d4c78592fd141e1ca46] | committer: James Almer
configure: remove old libdcadec check
It's obsolete after the addition of the pkg-config check.
See http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/191983 for the
relevant discussion
Reviewed-by: Hendrik Leppkes
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8254011b217356915fb49d4c78592fd141e1ca46
---
configure |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configure b/configure
index c11262a..c0d3cb4 100755
--- a/configure
+++ b/configure
@@ -5016,8 +5016,7 @@ enabled libcelt && require libcelt celt/celt.h
celt_decode -lcelt0 &&
{ check_lib celt/celt.h
celt_decoder_create_custom -lcelt0 ||
die "ERROR: libcelt must be installed and
version must be >= 0.11.0."; }
enabled libcaca && require_pkg_config caca caca.h caca_create_canvas
-enabled libdcadec && { use_pkg_config dcadec libdcadec/dca_context.h
dcadec_context_create ||
- { require libdcadec libdcadec/dca_context.h
dcadec_context_create -ldcadec; }; }
+enabled libdcadec && require_pkg_config dcadec libdcadec/dca_context.h
dcadec_context_create
enabled libfaac && require2 libfaac "stdint.h faac.h"
faacEncGetVersion -lfaac
enabled libfdk_aac&& require libfdk_aac fdk-aac/aacenc_lib.h
aacEncOpen -lfdk-aac
flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal
-lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish
-lflite_cmulex -lflite"
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ac3: validate end in ff_ac3_bit_alloc_calc_mask
ffmpeg | branch: release/2.2 | Andreas Cadhalpun | Thu Apr 16 21:25:26 2015 +0200| [a2908d49d1e1373264d4605cbc2e62a3ab53710b] | committer: Michael Niedermayer ac3: validate end in ff_ac3_bit_alloc_calc_mask This fixes an invalid read if end is 0: band_end = ff_ac3_bin_to_band_tab[end-1] + 1; Depending on what is before the array, this can cause stack smashing, when band_end becomes too large. Signed-off-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer (cherry picked from commit bc4fee7f2a51635fa3c0f61d1e5164da1efeded3) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2908d49d1e1373264d4605cbc2e62a3ab53710b --- libavcodec/ac3.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c index 29e132f..8d39bbe 100644 --- a/libavcodec/ac3.c +++ b/libavcodec/ac3.c @@ -131,6 +131,9 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd, int band_start, band_end, begin, end1; int lowcomp, fastleak, slowleak; +if (end <= 0) +return AVERROR_INVALIDDATA; + /* excitation function */ band_start = ff_ac3_bin_to_band_tab[start]; band_end = ff_ac3_bin_to_band_tab[end-1] + 1; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] fate: add mp3 gapless test
ffmpeg | branch: master | wm4 | Wed Apr 15 21:10:49
2015 +0200| [8297d87eecbf19821a8f6f1e230f025394f281d2] | committer: Michael
Niedermayer
fate: add mp3 gapless test
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8297d87eecbf19821a8f6f1e230f025394f281d2
---
tests/Makefile |1 +
tests/fate-run.sh | 22 ++
tests/fate/gapless.mak |7 +++
tests/ref/fate/gapless-mp3 |4
4 files changed, 34 insertions(+)
diff --git a/tests/Makefile b/tests/Makefile
index 8505211..cffa541 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -117,6 +117,7 @@ include $(SRC_PATH)/tests/fate/filter-audio.mak
include $(SRC_PATH)/tests/fate/filter-video.mak
include $(SRC_PATH)/tests/fate/flac.mak
include $(SRC_PATH)/tests/fate/fft.mak
+include $(SRC_PATH)/tests/fate/gapless.mak
include $(SRC_PATH)/tests/fate/gif.mak
include $(SRC_PATH)/tests/fate/h264.mak
include $(SRC_PATH)/tests/fate/hevc.mak
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 74f2645..c68c389 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -220,6 +220,28 @@ pixfmts(){
test=$outertest
}
+gapless(){
+sample=$(target_path $1)
+extra_args=$2
+
+decfile1="${outdir}/${test}.out-1"
+decfile2="${outdir}/${test}.out-2"
+cleanfiles="$cleanfiles $decfile1 $decfile2"
+
+# large enough to make ffmpeg.c seek to the start of the file
+start_offset=-1
+
+# test packet data
+ffmpeg -i "$sample" $extra_args -flags +bitexact -c:a copy -f framecrc -y
$decfile1
+do_md5sum $decfile1
+# test decoded (and cut) data
+ffmpeg -i "$sample" $extra_args -flags +bitexact -f wav md5:
+# the same as aboce again, with seeking to the start
+ffmpeg -ss $start_offset -i "$sample" $extra_args -flags +bitexact -c:a
copy -f framecrc -y $decfile2
+do_md5sum $decfile2
+ffmpeg -ss $start_offset -i "$sample" $extra_args -flags +bitexact -f wav
md5:
+}
+
mkdir -p "$outdir"
# Disable globbing: command arguments may contain globbing characters and
diff --git a/tests/fate/gapless.mak b/tests/fate/gapless.mak
new file mode 100644
index 000..7f0848d
--- /dev/null
+++ b/tests/fate/gapless.mak
@@ -0,0 +1,7 @@
+FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3
+fate-gapless-mp3: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 "-usetoc
1"
+
+FATE_GAPLESS = $(FATE_GAPLESS-yes)
+
+FATE_SAMPLES_AVCONV += $(FATE_GAPLESS)
+fate-gapless: $(FATE_GAPLESS)
diff --git a/tests/ref/fate/gapless-mp3 b/tests/ref/fate/gapless-mp3
new file mode 100644
index 000..9add70f
--- /dev/null
+++ b/tests/ref/fate/gapless-mp3
@@ -0,0 +1,4 @@
+d5c88cf38416329a052a9b0cb140fb4c *tests/data/fate/gapless-mp3.out-1
+3e41cbd4dcd511d3155234684252beab
+68f040b12d79c71e3b2e8ba90a9cbd96 *tests/data/fate/gapless-mp3.out-2
+3e41cbd4dcd511d3155234684252beab
\ No newline at end of file
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ac3: validate end in ff_ac3_bit_alloc_calc_mask
ffmpeg | branch: master | Andreas Cadhalpun | Thu Apr 16 21:25:26 2015 +0200| [bc4fee7f2a51635fa3c0f61d1e5164da1efeded3] | committer: Michael Niedermayer ac3: validate end in ff_ac3_bit_alloc_calc_mask This fixes an invalid read if end is 0: band_end = ff_ac3_bin_to_band_tab[end-1] + 1; Depending on what is before the array, this can cause stack smashing, when band_end becomes too large. Signed-off-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc4fee7f2a51635fa3c0f61d1e5164da1efeded3 --- libavcodec/ac3.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c index c4fc77c..b54315d 100644 --- a/libavcodec/ac3.c +++ b/libavcodec/ac3.c @@ -131,6 +131,9 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd, int band_start, band_end, begin, end1; int lowcomp, fastleak, slowleak; +if (end <= 0) +return AVERROR_INVALIDDATA; + /* excitation function */ band_start = ff_ac3_bin_to_band_tab[start]; band_end = ff_ac3_bin_to_band_tab[end-1] + 1; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavf/assenc: handle extra sections after Events
ffmpeg | branch: master | Rodger Combs | Sat Apr 4
05:31:22 2015 -0500| [55a1d75bf7855d147f420eba36e452ae401f78cb] | committer:
Michael Niedermayer
lavf/assenc: handle extra sections after Events
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55a1d75bf7855d147f420eba36e452ae401f78cb
---
libavformat/assenc.c | 28 ++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/libavformat/assenc.c b/libavformat/assenc.c
index 3fb9384..5222616 100644
--- a/libavformat/assenc.c
+++ b/libavformat/assenc.c
@@ -40,6 +40,8 @@ typedef struct ASSContext {
int cache_size;
int ssa_mode;
int ignore_readorder;
+uint8_t *trailer;
+size_t trailer_size;
} ASSContext;
static int write_header(AVFormatContext *s)
@@ -55,8 +57,23 @@ static int write_header(AVFormatContext *s)
ass->write_ts = avctx->codec_id == AV_CODEC_ID_ASS;
avpriv_set_pts_info(s->streams[0], 64, 1, 100);
if (avctx->extradata_size > 0) {
-avio_write(s->pb, avctx->extradata, avctx->extradata_size);
-if (avctx->extradata[avctx->extradata_size - 1] != '\n')
+size_t header_size = avctx->extradata_size;
+uint8_t *trailer = strstr(avctx->extradata, "\n[Events]");
+
+if (trailer)
+trailer = strstr(trailer, "Format:");
+if (trailer)
+trailer = strstr(trailer, "\n");
+
+if (trailer++) {
+header_size = (trailer - avctx->extradata);
+ass->trailer_size = avctx->extradata_size - header_size;
+if (ass->trailer_size)
+ass->trailer = trailer;
+}
+
+avio_write(s->pb, avctx->extradata, header_size);
+if (avctx->extradata[header_size - 1] != '\n')
avio_write(s->pb, "\r\n", 2);
ass->ssa_mode = !strstr(avctx->extradata, "\n[V4+ Styles]");
if (!strstr(avctx->extradata, "\n[Events]"))
@@ -192,7 +209,14 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
static int write_trailer(AVFormatContext *s)
{
+ASSContext *ass = s->priv_data;
+
purge_dialogues(s, 1);
+
+if (ass->trailer) {
+avio_write(s->pb, ass->trailer, ass->trailer_size);
+}
+
return 0;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aacpsy: avoid psy_band->threshold becoming NaN
ffmpeg | branch: release/2.2 | Andreas Cadhalpun | Thu Apr 16 20:04:54 2015 +0200| [fc9514bf4dd73c85ee4b7f4dc7ca0fb4fb7ea3e1] | committer: Michael Niedermayer aacpsy: avoid psy_band->threshold becoming NaN If band->thr is 0.0f, the division is undefined, making norm_fac not a number or infinity, which causes psy_band->threshold to become NaN. This is passed on to other variables until it finally reaches sce->sf_idx and is converted to an integer (-2147483648). This causes a segmentation fault when it is used as array index. Signed-off-by: Andreas Cadhalpun Reviewed-by: Claudio Freire Signed-off-by: Michael Niedermayer (cherry picked from commit e224aa41917454e7b5c23d9f2541425743ce595a) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc9514bf4dd73c85ee4b7f4dc7ca0fb4fb7ea3e1 --- libavcodec/aacpsy.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index d2a782e..a1183be 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -727,7 +727,10 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, if (active_lines > 0.0f) band->thr = calc_reduced_thr_3gpp(band, coeffs[g].min_snr, reduction); pe += calc_pe_3gpp(band); -band->norm_fac = band->active_lines / band->thr; +if (band->thr > 0.0f) +band->norm_fac = band->active_lines / band->thr; +else +band->norm_fac = 0.0f; norm_fac += band->norm_fac; } } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aacdec: consistently use avctx for logging in decode_eld_specific_config
ffmpeg | branch: release/2.2 | Andreas Cadhalpun
| Thu Apr 16 16:58:32 2015 +0200|
[3757ef017c3401c369d447324d1fce366c9c8507] | committer: Michael Niedermayer
aacdec: consistently use avctx for logging in decode_eld_specific_config
ac may be NULL and then accessing ac->avctx results in a segmentation fault.
Signed-off-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer
(cherry picked from commit 5b75689b987e4c4dd4f34d5c8be389547e9cc701)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3757ef017c3401c369d447324d1fce366c9c8507
---
libavcodec/aacdec.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index e6405f0..47282a1 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -881,7 +881,7 @@ static int decode_eld_specific_config(AACContext *ac,
AVCodecContext *avctx,
if (len == 15 + 255)
len += get_bits(gb, 16);
if (get_bits_left(gb) < len * 8 + 4) {
-av_log(ac->avctx, AV_LOG_ERROR, overread_err);
+av_log(avctx, AV_LOG_ERROR, overread_err);
return AVERROR_INVALIDDATA;
}
skip_bits_long(gb, 8 * len);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aasc: return correct buffer size from aasc_decode_frame
ffmpeg | branch: release/2.2 | Andreas Cadhalpun | Thu Apr 16 19:12:02 2015 +0200| [e863d17e6278248b1da991090fd5f2000b4d962b] | committer: Michael Niedermayer aasc: return correct buffer size from aasc_decode_frame Signed-off-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer (cherry picked from commit 0be54ad280cf114c02306b7063147e8379f8ed1e) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e863d17e6278248b1da991090fd5f2000b4d962b --- libavcodec/aasc.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 38658f8..a23f9b3 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -137,7 +137,7 @@ static int aasc_decode_frame(AVCodecContext *avctx, return ret; /* report that the buffer was completely consumed */ -return buf_size; +return avpkt->size; } static av_cold int aasc_decode_end(AVCodecContext *avctx) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aacpsy: avoid psy_band->threshold becoming NaN
ffmpeg | branch: master | Andreas Cadhalpun | Thu Apr 16 20:04:54 2015 +0200| [e224aa41917454e7b5c23d9f2541425743ce595a] | committer: Michael Niedermayer aacpsy: avoid psy_band->threshold becoming NaN If band->thr is 0.0f, the division is undefined, making norm_fac not a number or infinity, which causes psy_band->threshold to become NaN. This is passed on to other variables until it finally reaches sce->sf_idx and is converted to an integer (-2147483648). This causes a segmentation fault when it is used as array index. Signed-off-by: Andreas Cadhalpun Reviewed-by: Claudio Freire Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e224aa41917454e7b5c23d9f2541425743ce595a --- libavcodec/aacpsy.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index d1e65f6..7205ee3 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -727,7 +727,10 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, if (active_lines > 0.0f) band->thr = calc_reduced_thr_3gpp(band, coeffs[g].min_snr, reduction); pe += calc_pe_3gpp(band); -band->norm_fac = band->active_lines / band->thr; +if (band->thr > 0.0f) +band->norm_fac = band->active_lines / band->thr; +else +band->norm_fac = 0.0f; norm_fac += band->norm_fac; } } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aasc: return correct buffer size from aasc_decode_frame
ffmpeg | branch: master | Andreas Cadhalpun | Thu Apr 16 19:12:02 2015 +0200| [0be54ad280cf114c02306b7063147e8379f8ed1e] | committer: Michael Niedermayer aasc: return correct buffer size from aasc_decode_frame Signed-off-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0be54ad280cf114c02306b7063147e8379f8ed1e --- libavcodec/aasc.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 65ef782..469fc5e 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -137,7 +137,7 @@ static int aasc_decode_frame(AVCodecContext *avctx, return ret; /* report that the buffer was completely consumed */ -return buf_size; +return avpkt->size; } static av_cold int aasc_decode_end(AVCodecContext *avctx) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aacdec: consistently use avctx for logging in decode_eld_specific_config
ffmpeg | branch: master | Andreas Cadhalpun
| Thu Apr 16 16:58:32 2015 +0200| [5b75689b987e4c4dd4f34d5c8be389547e9cc701] |
committer: Michael Niedermayer
aacdec: consistently use avctx for logging in decode_eld_specific_config
ac may be NULL and then accessing ac->avctx results in a segmentation fault.
Signed-off-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b75689b987e4c4dd4f34d5c8be389547e9cc701
---
libavcodec/aacdec.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 1a2ddc2..f1576e6 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -900,7 +900,7 @@ static int decode_eld_specific_config(AACContext *ac,
AVCodecContext *avctx,
if (len == 15 + 255)
len += get_bits(gb, 16);
if (get_bits_left(gb) < len * 8 + 4) {
-av_log(ac->avctx, AV_LOG_ERROR, overread_err);
+av_log(avctx, AV_LOG_ERROR, overread_err);
return AVERROR_INVALIDDATA;
}
skip_bits_long(gb, 8 * len);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: add missing dependencies for MIPS and PPC features
ffmpeg | branch: master | James Almer | Thu Apr 16 02:59:17
2015 -0300| [1577b29c820a16e3ee570072693827082d33f12e] | committer: James Almer
configure: add missing dependencies for MIPS and PPC features
Reviewed-by: Michael Niedermayer
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1577b29c820a16e3ee570072693827082d33f12e
---
configure |4
1 file changed, 4 insertions(+)
diff --git a/configure b/configure
index 1d98828..c11262a 100755
--- a/configure
+++ b/configure
@@ -2012,14 +2012,18 @@ setend_deps="arm"
map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
+loongson_deps="mips"
mipsfpu_deps="mips"
mipsdspr1_deps="mips"
mipsdspr2_deps="mips"
+mips32r2_deps="mips"
mips32r5_deps="mips"
mips64r6_deps="mips"
msa_deps="mips"
altivec_deps="ppc"
+dcbzl_deps="ppc"
+ldbrx_deps="ppc"
ppc4xx_deps="ppc"
vsx_deps="ppc"
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Update for 2.2.15
ffmpeg | branch: release/2.2 | Michael Niedermayer | Thu Apr 16 16:17:18 2015 +0200| [ef1d4873a058e98448b8212d95728a2fe3b7f554] | committer: Michael Niedermayer Update for 2.2.15 Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef1d4873a058e98448b8212d95728a2fe3b7f554 --- RELEASE |2 +- doc/Doxyfile |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE b/RELEASE index 42a4ee5..5bd8c54 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -2.2.14 +2.2.15 diff --git a/doc/Doxyfile b/doc/Doxyfile index 92ec9d1..2ca490c 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = FFmpeg # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.2.14 +PROJECT_NUMBER = 2.2.15 # With the PROJECT_LOGO tag one can specify a logo or icon that is included # in the documentation. The maximum height of the logo should not exceed 55 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/aacdec: Fix storing state before PCE decode
ffmpeg | branch: release/2.2 | Michael Niedermayer | Thu Apr
9 00:04:44 2015 +0200| [684f86391d3d014790a981eb1531ae25f2f6d6a2] | committer:
Michael Niedermayer
avcodec/aacdec: Fix storing state before PCE decode
Fixes Ticket4460
Signed-off-by: Michael Niedermayer
(cherry picked from commit e88b3852aefaa39b2170ef185ad03dda18732821)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=684f86391d3d014790a981eb1531ae25f2f6d6a2
---
libavcodec/aacdec.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 3586aab..e6405f0 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -425,7 +425,7 @@ static uint64_t sniff_channel_order(uint8_t
(*layout_map)[3], int tags)
* Save current output configuration if and only if it has been locked.
*/
static void push_output_configuration(AACContext *ac) {
-if (ac->oc[1].status == OC_LOCKED) {
+if (ac->oc[1].status == OC_LOCKED || ac->oc[0].status == OC_NONE) {
ac->oc[0] = ac->oc[1];
}
ac->oc[1].status = OC_NONE;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/h264: reset the counts in the correct context
ffmpeg | branch: release/2.2 | Michael Niedermayer | Wed Apr
8 13:38:55 2015 +0200| [2b69da7b5ac3b6f96847f350f3f03c30b82832e9] | committer:
Michael Niedermayer
avcodec/h264: reset the counts in the correct context
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer
(cherry picked from commit 8f8d632220100bfde26587b27da73901b05cb774)
Conflicts:
libavcodec/h264.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b69da7b5ac3b6f96847f350f3f03c30b82832e9
---
libavcodec/h264.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f17304e..92c9fbc 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -5223,7 +5223,7 @@ again:
if (err < 0) {
av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
-h->ref_count[0] = h->ref_count[1] = h->list_count = 0;
+hx->ref_count[0] = hx->ref_count[1] = hx->list_count = 0;
} else if (err == 1) {
if (context_count > 1) {
ret = execute_decode_slices(h, context_count - 1);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/h264: Be more tolerant to changing pps id between slices
ffmpeg | branch: release/2.2 | Michael Niedermayer | Thu Apr 9 13:50:07 2015 +0200| [82d3dd44aad41a12b37f8bbd01b893c7fa3e13c2] | committer: Michael Niedermayer avcodec/h264: Be more tolerant to changing pps id between slices Fixes Ticket4446 Signed-off-by: Michael Niedermayer (cherry picked from commit 98d0c4236c7542c87f012228d3bc88aea67bddc2) Conflicts: libavcodec/h264.c (cherry picked from commit 0cd0fa9d0baabd2dc0442ed8b53ba65282733b61) Conflicts: libavcodec/h264.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82d3dd44aad41a12b37f8bbd01b893c7fa3e13c2 --- libavcodec/h264.c |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 92c9fbc..d2b88d1 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5011,9 +5011,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, continue; again: -if ( (!(avctx->active_thread_type & FF_THREAD_FRAME) || nals_needed >= nal_index) -&& !h->current_slice) -h->au_pps_id = -1; /* Ignore per frame NAL unit type during extradata * parsing. Decoding slices is not possible in codec init * with frame-mt */ @@ -5059,6 +5056,10 @@ again: hx->inter_gb_ptr = &hx->gb; hx->data_partitioning = 0; +if ( nals_needed >= nal_index +|| (!(avctx->active_thread_type & FF_THREAD_FRAME) && !context_count)) +h->au_pps_id = -1; + if ((err = decode_slice_header(hx, h))) break; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] msrledec: use signed pixel_ptr in msrle_decode_pal4
ffmpeg | branch: release/2.2 | Andreas Cadhalpun | Thu Apr 16 14:49:08 2015 +0200| [800d974cc41fce40b69a6386b3ad0fd618835698] | committer: Michael Niedermayer msrledec: use signed pixel_ptr in msrle_decode_pal4 This fixes segmentation faults, when pic->linesize[0] is negative. In that case 'line * pic->linesize[0] + pixel_ptr' is treated as unsigned and wraps around. This reverts commit 7d78a964. The problem was introduced in commit f7e1367f, which should obsolete that commit. Signed-off-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer (cherry picked from commit ae6fd7300b4e9f81d3b5ba201096ffe7cccf26fb) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=800d974cc41fce40b69a6386b3ad0fd618835698 --- libavcodec/msrledec.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c index deb6f86..200221a 100644 --- a/libavcodec/msrledec.c +++ b/libavcodec/msrledec.c @@ -36,7 +36,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic, unsigned char rle_code; unsigned char extra_byte, odd_pixel; unsigned char stream_byte; -unsigned int pixel_ptr = 0; +int pixel_ptr = 0; int line = avctx->height - 1; int i; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/h264_slice: Dont reset mb_aff_frame per slice
ffmpeg | branch: release/2.2 | Michael Niedermayer | Wed Apr
8 12:29:47 2015 +0200| [0df90898f5a3cbbb8c664a05d69c29655ccf0a80] | committer:
Michael Niedermayer
avcodec/h264_slice: Dont reset mb_aff_frame per slice
Fixes null pointer dereference
Fixes Ticket4440
Signed-off-by: Michael Niedermayer
(cherry picked from commit 386601286fed2dff5e1955bc21a0256f6f35ab19)
Conflicts:
libavcodec/h264_slice.c
(cherry picked from commit ce6d38e9ed0842870f3cd5414937bb6d1f2417d9)
Conflicts:
libavcodec/h264_slice.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0df90898f5a3cbbb8c664a05d69c29655ccf0a80
---
libavcodec/h264.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 61fd02f..f17304e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3512,6 +3512,7 @@ static int decode_slice_header(H264Context *h,
H264Context *h0)
int field_pic_flag, bottom_field_flag;
int first_slice = h == h0 && !h0->current_slice;
int frame_num, picture_structure, droppable;
+int mb_aff_frame, last_mb_aff_frame;
PPS *pps;
h->me.qpel_put = h->h264qpel.put_h264_qpel_pixels_tab;
@@ -3727,7 +3728,8 @@ static int decode_slice_header(H264Context *h,
H264Context *h0)
}
h->mb_mbaff= 0;
-h->mb_aff_frame= 0;
+mb_aff_frame = 0;
+last_mb_aff_frame = h0->mb_aff_frame;
last_pic_structure = h0->picture_structure;
last_pic_droppable = h0->droppable;
droppable = h->nal_ref_idc == 0;
@@ -3745,12 +3747,13 @@ static int decode_slice_header(H264Context *h,
H264Context *h0)
picture_structure = PICT_TOP_FIELD + bottom_field_flag;
} else {
picture_structure = PICT_FRAME;
-h->mb_aff_frame = h->sps.mb_aff;
+mb_aff_frame = h->sps.mb_aff;
}
}
if (h0->current_slice) {
if (last_pic_structure != picture_structure ||
-last_pic_droppable != droppable) {
+last_pic_droppable != droppable ||
+last_mb_aff_frame != mb_aff_frame) {
av_log(h->avctx, AV_LOG_ERROR,
"Changing field mode (%d -> %d) between slices is not
allowed\n",
last_pic_structure, h->picture_structure);
@@ -3766,6 +3769,7 @@ static int decode_slice_header(H264Context *h,
H264Context *h0)
h->picture_structure = picture_structure;
h->droppable = droppable;
h->frame_num = frame_num;
+h->mb_aff_frame = mb_aff_frame;
h->mb_field_decoding_flag = picture_structure != PICT_FRAME;
if (h0->current_slice == 0) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] tests: Fix test name for pixfmts tests( cherry picked from commit e1ee0521a698809ed216e9e5c11bd2bbb466ed04)
ffmpeg | branch: release/2.2 | Timothy Gu | Sun Nov 9
21:37:18 2014 -0800| [67a4811c88c4eaa5503cf6abea27a0e64afb6a65] | committer:
Michael Niedermayer
tests: Fix test name for pixfmts tests(cherry picked from commit
e1ee0521a698809ed216e9e5c11bd2bbb466ed04)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67a4811c88c4eaa5503cf6abea27a0e64afb6a65
---
tests/fate-run.sh |2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 48e9dd0..7f88dff 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -200,12 +200,14 @@ pixfmts(){
$showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print
fmt }' | sort >$in_fmts
pix_fmts=$(comm -12 $scale_exclude_fmts $in_fmts)
+outertest=$test
for pix_fmt in $pix_fmts; do
test=$pix_fmt
video_filter "${prefilter_chain}format=$pix_fmt,$filter=$filter_args"
-pix_fmt $pix_fmt
done
rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts
+test=$outertest
}
mkdir -p "$outdir"
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] msrledec: use signed pixel_ptr in msrle_decode_pal4
ffmpeg | branch: master | Andreas Cadhalpun | Thu Apr 16 14:49:08 2015 +0200| [ae6fd7300b4e9f81d3b5ba201096ffe7cccf26fb] | committer: Michael Niedermayer msrledec: use signed pixel_ptr in msrle_decode_pal4 This fixes segmentation faults, when pic->linesize[0] is negative. In that case 'line * pic->linesize[0] + pixel_ptr' is treated as unsigned and wraps around. This reverts commit 7d78a964. The problem was introduced in commit f7e1367f, which should obsolete that commit. Signed-off-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae6fd7300b4e9f81d3b5ba201096ffe7cccf26fb --- libavcodec/msrledec.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c index c738198..9d05bc8 100644 --- a/libavcodec/msrledec.c +++ b/libavcodec/msrledec.c @@ -36,7 +36,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic, unsigned char rle_code; unsigned char extra_byte, odd_pixel; unsigned char stream_byte; -unsigned int pixel_ptr = 0; +int pixel_ptr = 0; int line = avctx->height - 1; int i; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: add pkg-config support for libdcadec
ffmpeg | branch: master | Simon Thelen | Wed Apr 15
17:18:58 2015 +0200| [ed2a712750c3342e399a44f9c5c2bd278128c759] | committer:
Michael Niedermayer
configure: add pkg-config support for libdcadec
Signed-off-by: Simon Thelen
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed2a712750c3342e399a44f9c5c2bd278128c759
---
configure |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 389de92..1d98828 100755
--- a/configure
+++ b/configure
@@ -5012,7 +5012,8 @@ enabled libcelt && require libcelt celt/celt.h
celt_decode -lcelt0 &&
{ check_lib celt/celt.h
celt_decoder_create_custom -lcelt0 ||
die "ERROR: libcelt must be installed and
version must be >= 0.11.0."; }
enabled libcaca && require_pkg_config caca caca.h caca_create_canvas
-enabled libdcadec && require libdcadec libdcadec/dca_context.h
dcadec_context_create -ldcadec
+enabled libdcadec && { use_pkg_config dcadec libdcadec/dca_context.h
dcadec_context_create ||
+ { require libdcadec libdcadec/dca_context.h
dcadec_context_create -ldcadec; }; }
enabled libfaac && require2 libfaac "stdint.h faac.h"
faacEncGetVersion -lfaac
enabled libfdk_aac&& require libfdk_aac fdk-aac/aacenc_lib.h
aacEncOpen -lfdk-aac
flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal
-lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish
-lflite_cmulex -lflite"
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ivfenc: incorrect fourcc for VP9 video
ffmpeg | branch: master | Victor Anjin | Wed Apr 15
23:51:59 2015 +0700| [2db24cf746dc871903ada25b184f5e5decd95a42] | committer:
Michael Niedermayer
ivfenc: incorrect fourcc for VP9 video
VP80 fourcc are writed for all contexts (without ctx->codec_tag)
how to reproduce the issue:
1) Get any vp9 video (for example http://base-n.de/webm/out9.webm)
2) ffmpeg -i out9.webm -vcodec copy out9.ivf
3) out9.ivf have VP80 fourcc at ivf header
The proposed fix solves this issue
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2db24cf746dc871903ada25b184f5e5decd95a42
---
libavformat/ivfenc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c
index 5700f01..1d76c5c 100644
--- a/libavformat/ivfenc.c
+++ b/libavformat/ivfenc.c
@@ -38,7 +38,7 @@ static int ivf_write_header(AVFormatContext *s)
avio_write(pb, "DKIF", 4);
avio_wl16(pb, 0); // version
avio_wl16(pb, 32); // header length
-avio_wl32(pb, ctx->codec_tag ? ctx->codec_tag : AV_RL32("VP80"));
+avio_wl32(pb, ctx->codec_tag ? ctx->codec_tag : ctx->codec_id ==
AV_CODEC_ID_VP9 ? AV_RL32("VP90") : AV_RL32("VP80"));
avio_wl16(pb, ctx->width);
avio_wl16(pb, ctx->height);
avio_wl32(pb, s->streams[0]->time_base.den);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavfi/avf_showcqt: fix error code.
ffmpeg | branch: master | Nicolas George | Thu Apr 16 11:31:23 2015 +0200| [38155865df73627f7a7001acbc2243991e96463d] | committer: Michael Niedermayer lavfi/avf_showcqt: fix error code. Signed-off-by: Nicolas George Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38155865df73627f7a7001acbc2243991e96463d --- libavfilter/avf_showcqt.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c index e862dc7..8c6ce1f 100644 --- a/libavfilter/avf_showcqt.c +++ b/libavfilter/avf_showcqt.c @@ -723,7 +723,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) s->fft_data[x] = s->fft_data[x+step]; s->remaining_fill += step; } -return AVERROR(EOF); +return AVERROR_EOF; } remaining = insamples->nb_samples; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
