[FFmpeg-cvslog] avformat/imf_cpl: do not use filesize when reading XML file
ffmpeg | branch: master | Marton Balint | Tue Feb 1 00:08:22
2022 +0100| [8a9d3d3dec74568a1a7f226dab3a779cd0bfc079] | committer: Marton
Balint
avformat/imf_cpl: do not use filesize when reading XML file
Similar to the earlier patch applied to imfdec.
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a9d3d3dec74568a1a7f226dab3a779cd0bfc079
---
libavformat/imf_cpl.c | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c
index f2ad9c05d6..102a6b4549 100644
--- a/libavformat/imf_cpl.c
+++ b/libavformat/imf_cpl.c
@@ -797,13 +797,11 @@ int ff_imf_parse_cpl(AVIOContext *in, FFIMFCPL **cpl)
AVBPrint buf;
xmlDoc *doc = NULL;
int ret = 0;
-int64_t filesize = 0;
-filesize = avio_size(in);
-filesize = filesize > 0 ? filesize : 8192;
-av_bprint_init(&buf, filesize + 1, AV_BPRINT_SIZE_UNLIMITED);
-ret = avio_read_to_bprint(in, &buf, UINT_MAX - 1);
-if (ret < 0 || !avio_feof(in) || buf.len == 0) {
+av_bprint_init(&buf, 0, INT_MAX); // xmlReadMemory uses integer length
+
+ret = avio_read_to_bprint(in, &buf, SIZE_MAX);
+if (ret < 0 || !avio_feof(in)) {
av_log(NULL, AV_LOG_ERROR, "Cannot read IMF CPL\n");
if (ret == 0)
ret = AVERROR_INVALIDDATA;
@@ -812,8 +810,7 @@ int ff_imf_parse_cpl(AVIOContext *in, FFIMFCPL **cpl)
LIBXML_TEST_VERSION
-filesize = buf.len;
-doc = xmlReadMemory(buf.str, filesize, NULL, NULL, 0);
+doc = xmlReadMemory(buf.str, buf.len, NULL, NULL, 0);
if (!doc) {
av_log(NULL,
AV_LOG_ERROR,
___
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/demux: don't propagate unsupported skip samples packet side data values
ffmpeg | branch: master | James Almer | Mon Jan 31 22:56:45
2022 -0300| [3b9bd63ad92967e06d5e2f67e0cfd9093bf7700d] | committer: James Almer
avformat/demux: don't propagate unsupported skip samples packet side data values
Should fix ticket #9622
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b9bd63ad92967e06d5e2f67e0cfd9093bf7700d
---
libavformat/demux.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavformat/demux.c b/libavformat/demux.c
index f895f0ba85..09d539af68 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -1354,6 +1354,7 @@ static int read_frame_internal(AVFormatContext *s,
AVPacket *pkt)
}
if (sti->start_skip_samples && (pkt->pts == 0 || pkt->pts ==
RELATIVE_TS_BASE))
sti->skip_samples = sti->start_skip_samples;
+sti->skip_samples = FFMAX(0, sti->skip_samples);
if (sti->skip_samples || discard_padding) {
uint8_t *p = av_packet_new_side_data(pkt,
AV_PKT_DATA_SKIP_SAMPLES, 10);
if (p) {
___
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] avcodec/decode: ignore unsupported skip samples packet side data values
ffmpeg | branch: master | James Almer | Mon Jan 31 22:56:46
2022 -0300| [22d6d2b4818f3b1b451d1b4c4dd3d484e3040261] | committer: James Almer
avcodec/decode: ignore unsupported skip samples packet side data values
Same as in the AV_FRAME_FLAG_DISCARD codepath, ensure avci->skip_samples is not
negative.
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22d6d2b4818f3b1b451d1b4c4dd3d484e3040261
---
libavcodec/decode.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 0912f86a14..4f9b949926 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -366,6 +366,7 @@ static inline int decode_simple_internal(AVCodecContext
*avctx, AVFrame *frame,
side= av_packet_get_side_data(avci->last_pkt_props,
AV_PKT_DATA_SKIP_SAMPLES, &side_size);
if(side && side_size>=10) {
avci->skip_samples = AV_RL32(side) * avci->skip_samples_multiplier;
+avci->skip_samples = FFMAX(0, avci->skip_samples);
discard_padding = AV_RL32(side + 4);
av_log(avctx, AV_LOG_DEBUG, "skip %d / discard %d samples due to
side data\n",
avci->skip_samples, (int)discard_padding);
___
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/demux: print skip_samples and discard_padding as unsigned values in debug log
ffmpeg | branch: master | James Almer | Mon Jan 31 22:56:47
2022 -0300| [928e7c60cc5f220e931df51392b5577b253ffa23] | committer: James Almer
avformat/demux: print skip_samples and discard_padding as unsigned values in
debug log
It's the type they should be interpreted as in the AV_PKT_DATA_SKIP_SAMPLES side
data.
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=928e7c60cc5f220e931df51392b5577b253ffa23
---
libavformat/demux.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/demux.c b/libavformat/demux.c
index 09d539af68..4509015847 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -1360,7 +1360,8 @@ static int read_frame_internal(AVFormatContext *s,
AVPacket *pkt)
if (p) {
AV_WL32(p, sti->skip_samples);
AV_WL32(p + 4, discard_padding);
-av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d / discard
%d\n", sti->skip_samples, discard_padding);
+av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %u / discard
%u\n",
+ (unsigned)sti->skip_samples, (unsigned)discard_padding);
}
sti->skip_samples = 0;
}
___
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/demux: don't truncate the return value of ts_to_samples()
ffmpeg | branch: master | James Almer | Mon Jan 31 22:56:48
2022 -0300| [0ea87ebc19c843747d6e3f7e060e2f2da634eb03] | committer: James Almer
avformat/demux: don't truncate the return value of ts_to_samples()
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ea87ebc19c843747d6e3f7e060e2f2da634eb03
---
libavformat/demux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/demux.c b/libavformat/demux.c
index 4509015847..ec34b65288 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -1346,7 +1346,7 @@ static int read_frame_internal(AVFormatContext *s,
AVPacket *pkt)
if (sti->first_discard_sample && pkt->pts != AV_NOPTS_VALUE) {
int64_t pts = pkt->pts - (is_relative(pkt->pts) ? RELATIVE_TS_BASE
: 0);
int64_t sample = ts_to_samples(st, pts);
-int duration = ts_to_samples(st, pkt->duration);
+int64_t duration = ts_to_samples(st, pkt->duration);
int64_t end_sample = sample + duration;
if (duration > 0 && end_sample >= sti->first_discard_sample &&
sample < sti->last_discard_sample)
___
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/tests: add /imf to .gitignore
ffmpeg | branch: master | Pierre-Anthony Lemieux | Fri Feb 4 18:07:38 2022 -0800| [bec300f4e18f53f6e33ad183b2ef9d5a422088d9] | committer: Zane van Iperen avformat/tests: add /imf to .gitignore Signed-off-by: Zane van Iperen > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bec300f4e18f53f6e33ad183b2ef9d5a422088d9 --- libavformat/tests/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/tests/.gitignore b/libavformat/tests/.gitignore index 7ceb7a356b..aabf76345e 100644 --- a/libavformat/tests/.gitignore +++ b/libavformat/tests/.gitignore @@ -1,4 +1,5 @@ /fifo_muxer +/imf /movenc /noproxy /rtmpdh ___ 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/imf: cosmetics
ffmpeg | branch: master | Zane van Iperen | Fri Jan 7
19:16:25 2022 +1000| [40766ae1da412f7a8f665fd49c0de905f856552e] | committer:
Zane van Iperen
avformat/imf: cosmetics
s/++i/i++/g
Signed-off-by: Zane van Iperen
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40766ae1da412f7a8f665fd49c0de905f856552e
---
libavformat/imfdec.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c
index d67c9b8898..847dead7f0 100644
--- a/libavformat/imfdec.c
+++ b/libavformat/imfdec.c
@@ -261,7 +261,7 @@ static void imf_asset_locator_map_init(IMFAssetLocatorMap
*asset_map)
*/
static void imf_asset_locator_map_deinit(IMFAssetLocatorMap *asset_map)
{
-for (uint32_t i = 0; i < asset_map->asset_count; ++i)
+for (uint32_t i = 0; i < asset_map->asset_count; i++)
av_freep(&asset_map->assets[i].absolute_uri);
av_freep(&asset_map->assets);
@@ -327,7 +327,7 @@ clean_up:
static IMFAssetLocator *find_asset_map_locator(IMFAssetLocatorMap *asset_map,
FFIMFUUID uuid)
{
-for (uint32_t i = 0; i < asset_map->asset_count; ++i) {
+for (uint32_t i = 0; i < asset_map->asset_count; i++) {
if (memcmp(asset_map->assets[i].uuid, uuid, 16) == 0)
return &(asset_map->assets[i]);
}
@@ -464,7 +464,7 @@ static int open_track_file_resource(AVFormatContext *s,
return AVERROR(ENOMEM);
track->resources = tmp;
-for (uint32_t i = 0; i < track_file_resource->base.repeat_count; ++i) {
+for (uint32_t i = 0; i < track_file_resource->base.repeat_count; i++) {
IMFVirtualTrackResourcePlaybackCtx vt_ctx;
vt_ctx.locator = asset_locator;
@@ -484,7 +484,7 @@ static int open_track_file_resource(AVFormatContext *s,
static void
imf_virtual_track_playback_context_deinit(IMFVirtualTrackPlaybackCtx *track)
{
-for (uint32_t i = 0; i < track->resource_count; ++i)
+for (uint32_t i = 0; i < track->resource_count; i++)
avformat_close_input(&track->resources[i].ctx);
av_freep(&track->resources);
@@ -546,7 +546,7 @@ static int set_context_streams_from_tracks(AVFormatContext
*s)
IMFContext *c = s->priv_data;
int ret = 0;
-for (uint32_t i = 0; i < c->track_count; ++i) {
+for (uint32_t i = 0; i < c->track_count; i++) {
AVStream *asset_stream;
AVStream *first_resource_stream;
@@ -593,7 +593,7 @@ static int open_cpl_tracks(AVFormatContext *s)
}
}
-for (uint32_t i = 0; i < c->cpl->main_audio_track_count; ++i) {
+for (uint32_t i = 0; i < c->cpl->main_audio_track_count; i++) {
if ((ret = open_virtual_track(s, &c->cpl->main_audio_tracks[i],
track_index++)) != 0) {
av_log(s,
AV_LOG_ERROR,
@@ -711,7 +711,7 @@ static IMFVirtualTrackResourcePlaybackCtx
*get_resource_context_for_timestamp(AV
track->index,
av_q2d(track->current_timestamp),
av_q2d(track->duration));
-for (uint32_t i = 0; i < track->resource_count; ++i) {
+for (uint32_t i = 0; i < track->resource_count; i++) {
cumulated_duration = av_add_q(cumulated_duration,
av_make_q((int)track->resources[i].resource->base.duration
* edit_unit_duration.num,
@@ -836,7 +836,7 @@ static int imf_close(AVFormatContext *s)
imf_asset_locator_map_deinit(&c->asset_locator_map);
ff_imf_cpl_free(c->cpl);
-for (uint32_t i = 0; i < c->track_count; ++i) {
+for (uint32_t i = 0; i < c->track_count; i++) {
imf_virtual_track_playback_context_deinit(c->tracks[i]);
av_freep(&c->tracks[i]);
}
___
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] avfilter/af_apsyclip: fix FFT bin indexing
ffmpeg | branch: master | Jason Jang | Fri Jan 28 17:08:27
2022 -0800| [b4ad13420f57ff7b2a411f2f70217635d1516a80] | committer: Paul B Mahol
avfilter/af_apsyclip: fix FFT bin indexing
With a complex FFT instead of real FFT, the negative frequencies
are not dropped from the spectrum output, so they need to be scaled
when the positive frequencies are scaled. The location of the top
bin is also different.
Signed-off-by: Jason Jang
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4ad13420f57ff7b2a411f2f70217635d1516a80
---
libavfilter/af_apsyclip.c | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/libavfilter/af_apsyclip.c b/libavfilter/af_apsyclip.c
index dc3a8e97e4..0bc469c1a1 100644
--- a/libavfilter/af_apsyclip.c
+++ b/libavfilter/af_apsyclip.c
@@ -292,10 +292,9 @@ static void calculate_mask_curve(AudioPsyClipContext *s,
if (i == 0) {
magnitude = FFABS(spectrum[0]);
} else if (i == s->fft_size / 2) {
-magnitude = FFABS(spectrum[1]);
+magnitude = FFABS(spectrum[s->fft_size]);
} else {
-// although the negative frequencies are omitted because they are
redundant,
-// the magnitude of the positive frequencies are not doubled.
+// Because the input signal is real, the + and - frequencies are
redundant.
// Multiply the magnitude by 2 to simulate adding up the + and -
frequencies.
magnitude = hypotf(spectrum[2 * i], spectrum[2 * i + 1]) * 2;
}
@@ -315,10 +314,9 @@ static void calculate_mask_curve(AudioPsyClipContext *s,
for (int i = s->num_psy_bins; i < s->fft_size / 2 + 1; i++) {
float magnitude;
if (i == s->fft_size / 2) {
-magnitude = FFABS(spectrum[1]);
+magnitude = FFABS(spectrum[s->fft_size]);
} else {
-// although the negative frequencies are omitted because they are
redundant,
-// the magnitude of the positive frequencies are not doubled.
+// Because the input signal is real, the + and - frequencies are
redundant.
// Multiply the magnitude by 2 to simulate adding up the + and -
frequencies.
magnitude = hypotf(spectrum[2 * i], spectrum[2 * i + 1]) * 2;
}
@@ -360,19 +358,20 @@ static void limit_clip_spectrum(AudioPsyClipContext *s,
for (int i = 1; i < s->fft_size / 2; i++) {
float real = clip_spectrum[i * 2];
float imag = clip_spectrum[i * 2 + 1];
-// although the negative frequencies are omitted because they are
redundant,
-// the magnitude of the positive frequencies are not doubled.
+// Because the input signal is real, the + and - frequencies are
redundant.
// Multiply the magnitude by 2 to simulate adding up the + and -
frequencies.
relative_distortion_level = hypotf(real, imag) * 2 / mask_curve[i];
if (relative_distortion_level > 1.0) {
clip_spectrum[i * 2] /= relative_distortion_level;
clip_spectrum[i * 2 + 1] /= relative_distortion_level;
+clip_spectrum[s->fft_size * 2 - i * 2] /=
relative_distortion_level;
+clip_spectrum[s->fft_size * 2 - i * 2 + 1] /=
relative_distortion_level;
}
}
// bin N/2
-relative_distortion_level = FFABS(clip_spectrum[1]) /
mask_curve[s->fft_size / 2];
+relative_distortion_level = FFABS(clip_spectrum[s->fft_size]) /
mask_curve[s->fft_size / 2];
if (relative_distortion_level > 1.f)
-clip_spectrum[1] /= relative_distortion_level;
+clip_spectrum[s->fft_size] /= relative_distortion_level;
}
static void r2c(float *buffer, int size)
___
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] avfilter/af_apsyclip: fix peak overestimation
ffmpeg | branch: master | Jason Jang | Fri Jan 28 17:12:41 2022 -0800| [18fceb99260a74ec80d661b28f0ab32783130516] | committer: Paul B Mahol avfilter/af_apsyclip: fix peak overestimation Ignore more samples that are near the edge of the block. The reason is that the filtering tends to cause these samples to go above the window more than the samples near the middle. If these samples are included in the unwindowed peak estimation, the peak can be overestimated. Because the block is windowed again before overlapping, overshoots near the edge of the block are not very important. 0.1 is the value from the version originally contributed to calf. Signed-off-by: Jason Jang > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18fceb99260a74ec80d661b28f0ab32783130516 --- libavfilter/af_apsyclip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_apsyclip.c b/libavfilter/af_apsyclip.c index 0bc469c1a1..2a79ed3a8a 100644 --- a/libavfilter/af_apsyclip.c +++ b/libavfilter/af_apsyclip.c @@ -87,7 +87,7 @@ static void generate_hann_window(float *window, float *inv_window, int size) window[i] = value; // 1/window to calculate unwindowed peak. -inv_window[i] = value > 0.01f ? 1.f / value : 0.f; +inv_window[i] = value > 0.1f ? 1.f / value : 0.f; } } ___ 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] avfilter/af_apsyclip: increase protection for high frequencies
ffmpeg | branch: master | Jason Jang | Fri Jan 28 17:15:54
2022 -0800| [306994b887d484eb9e0a9aa95b8d7825ce4efec1] | committer: Paul B Mahol
avfilter/af_apsyclip: increase protection for high frequencies
This reduces sibilance distortion when sibilance and bass are
present at the same time. Bringing the protection of high
frequencies up to about the same level as for low frequencies
should also make the quality less dependent on the frequency
balance of the playback system.
Signed-off-by: Jason Jang
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=306994b887d484eb9e0a9aa95b8d7825ce4efec1
---
libavfilter/af_apsyclip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/af_apsyclip.c b/libavfilter/af_apsyclip.c
index 2a79ed3a8a..1f4114894c 100644
--- a/libavfilter/af_apsyclip.c
+++ b/libavfilter/af_apsyclip.c
@@ -186,7 +186,7 @@ static int config_input(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
AudioPsyClipContext *s = ctx->priv;
-static const int points[][2] = { {0,14}, {125,14}, {250,16}, {500,18},
{1000,20}, {2000,20}, {4000,20}, {8000,15}, {16000,5}, {2,-10} };
+static const int points[][2] = { {0,14}, {125,14}, {250,16}, {500,18},
{1000,20}, {2000,20}, {4000,20}, {8000,17}, {16000,14}, {2,-10} };
static const int num_points = 10;
float scale;
int ret;
___
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] avfilter/vf_cas: unbreak >8 depth support
ffmpeg | branch: master | Paul B Mahol | Sat Feb 5 20:56:33
2022 +0100| [bedb4bac1c8e2695cf10d21c6b3ed23c877934e7] | committer: Paul B Mahol
avfilter/vf_cas: unbreak >8 depth support
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bedb4bac1c8e2695cf10d21c6b3ed23c877934e7
---
libavfilter/vf_cas.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavfilter/vf_cas.c b/libavfilter/vf_cas.c
index 305aec9bd1..c45529cef7 100644
--- a/libavfilter/vf_cas.c
+++ b/libavfilter/vf_cas.c
@@ -65,7 +65,7 @@ static int cas_slice8(AVFilterContext *avctx, void *arg, int
jobnr, int nb_jobs)
const uint8_t *src = in->data[p];
if (!((1 << p) & s->planes)) {
-av_image_copy_plane(dst, linesize, src + slice_start * linesize,
in_linesize,
+av_image_copy_plane(dst, linesize, src + slice_start *
in_linesize, in_linesize,
w, slice_end - slice_start);
continue;
}
@@ -128,12 +128,12 @@ static int cas_slice16(AVFilterContext *avctx, void *arg,
int jobnr, int nb_jobs
const int w1 = w - 1;
const int h = s->planeheight[p];
const int h1 = h - 1;
-uint16_t *dst = (uint16_t *)out->data[p] + slice_start * linesize;
+uint16_t *dst = ((uint16_t *)out->data[p]) + slice_start * linesize;
const uint16_t *src = (const uint16_t *)in->data[p];
if (!((1 << p) & s->planes)) {
-av_image_copy_plane((uint8_t *)dst, linesize, (uint8_t *)(src +
slice_start * linesize),
-in_linesize, w * 2, slice_end - slice_start);
+av_image_copy_plane((uint8_t *)dst, linesize * 2, (uint8_t *)(src
+ slice_start * in_linesize),
+in_linesize * 2, w * 2, slice_end -
slice_start);
continue;
}
___
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/mxfdec: add avlanguage dependency
ffmpeg | branch: master | Zane van Iperen | Sun Feb 6 13:20:46 2022 +1000| [f14dbb4bf50009fdec601b2e343b46b151104eb3] | committer: Zane van Iperen avformat/mxfdec: add avlanguage dependency Reviewed-by: Andreas Rheinhardt Signed-off-by: Zane van Iperen > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f14dbb4bf50009fdec601b2e343b46b151104eb3 --- libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 3dc6a479cc..6566e40cac 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -374,7 +374,7 @@ OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o OBJS-$(CONFIG_MUSX_DEMUXER) += musx.o OBJS-$(CONFIG_MV_DEMUXER)+= mvdec.o OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o -OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o +OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o avlanguage.o OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o avc.o OBJS-$(CONFIG_MXG_DEMUXER) += mxg.o OBJS-$(CONFIG_NC_DEMUXER)+= ncdec.o ___ 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".
