[FFmpeg-cvslog] avfilter/avf_showcqt: add .
ffmpeg | branch: master | Muhammad Faiz | Thu May 5
14:03:32 2016 +0700| [d2f73c3daf024b1cfcd4e694cb4b94e4da1f3bb7] | committer:
Muhammad Faiz
avfilter/avf_showcqt: add .
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2f73c3daf024b1cfcd4e694cb4b94e4da1f3bb7
---
libavfilter/af_firequalizer.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c
index 4c9d95e..a5c3550 100644
--- a/libavfilter/af_firequalizer.c
+++ b/libavfilter/af_firequalizer.c
@@ -581,7 +581,7 @@ static const AVFilterPad firequalizer_outputs[] = {
AVFilter ff_af_firequalizer = {
.name = "firequalizer",
-.description= NULL_IF_CONFIG_SMALL("Finite Impulse Response
Equalizer"),
+.description= NULL_IF_CONFIG_SMALL("Finite Impulse Response
Equalizer."),
.uninit = uninit,
.query_formats = query_formats,
.process_command= process_command,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_waveform: fix order of graticule scale items
ffmpeg | branch: master | Paul B Mahol | Thu May 5 10:34:13
2016 +0200| [5b174dd3f133387688be96eaead1ca0e15cc74f5] | committer: Paul B Mahol
avfilter/vf_waveform: fix order of graticule scale items
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b174dd3f133387688be96eaead1ca0e15cc74f5
---
libavfilter/vf_waveform.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index 26aa809..c2b84fb 100644
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -145,8 +145,8 @@ static const AVOption waveform_options[] = {
{ "scale", "set scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=0}, 0,
NB_SCALES-1, FLAGS, "scale" },
{ "s", "set scale", OFFSET(scale), AV_OPT_TYPE_INT, {.i64=0}, 0,
NB_SCALES-1, FLAGS, "scale" },
{ "digital",NULL, 0, AV_OPT_TYPE_CONST, {.i64=DIGITAL},0, 0,
FLAGS, "scale" },
-{ "ire",NULL, 0, AV_OPT_TYPE_CONST, {.i64=IRE},0, 0,
FLAGS, "scale" },
{ "millivolts", NULL, 0, AV_OPT_TYPE_CONST, {.i64=MILLIVOLTS}, 0, 0,
FLAGS, "scale" },
+{ "ire",NULL, 0, AV_OPT_TYPE_CONST, {.i64=IRE},0, 0,
FLAGS, "scale" },
{ NULL }
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
Re: [FFmpeg-cvslog] avformat/mpegtsenc: fix usage of AVStream.codec
James Almer videolan.org> writes: > avformat/mpegtsenc: fix usage of AVStream.codec Thank you! Carl Eugen ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavd/avfoundation: use AVCodecParameters
ffmpeg | branch: master | Rick Kern | Thu May 5 09:08:02
2016 -0400| [f1560dbb2a0089d63ca61a324673f7e2e30fb517] | committer: Thilo
Borgmann
lavd/avfoundation: use AVCodecParameters
Fixes "Could not find codec parameters for stream" error (#5494)
Signed-off-by: Rick Kern
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1560dbb2a0089d63ca61a324673f7e2e30fb517
---
libavdevice/avfoundation.m | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m
index 763e675..8132278 100644
--- a/libavdevice/avfoundation.m
+++ b/libavdevice/avfoundation.m
@@ -560,11 +560,11 @@ static int get_video_config(AVFormatContext *s)
image_buffer = CMSampleBufferGetImageBuffer(ctx->current_frame);
image_buffer_size = CVImageBufferGetEncodedSize(image_buffer);
-stream->codec->codec_id = AV_CODEC_ID_RAWVIDEO;
-stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-stream->codec->width = (int)image_buffer_size.width;
-stream->codec->height = (int)image_buffer_size.height;
-stream->codec->pix_fmt= ctx->pixel_format;
+stream->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO;
+stream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+stream->codecpar->width = (int)image_buffer_size.width;
+stream->codecpar->height = (int)image_buffer_size.height;
+stream->codecpar->format = ctx->pixel_format;
CFRelease(ctx->current_frame);
ctx->current_frame = nil;
@@ -603,10 +603,10 @@ static int get_audio_config(AVFormatContext *s)
return 1;
}
-stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-stream->codec->sample_rate= basic_desc->mSampleRate;
-stream->codec->channels = basic_desc->mChannelsPerFrame;
-stream->codec->channel_layout =
av_get_default_channel_layout(stream->codec->channels);
+stream->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+stream->codecpar->sample_rate= basic_desc->mSampleRate;
+stream->codecpar->channels = basic_desc->mChannelsPerFrame;
+stream->codecpar->channel_layout =
av_get_default_channel_layout(stream->codecpar->channels);
ctx->audio_channels= basic_desc->mChannelsPerFrame;
ctx->audio_bits_per_sample = basic_desc->mBitsPerChannel;
@@ -620,22 +620,22 @@ static int get_audio_config(AVFormatContext *s)
ctx->audio_float &&
ctx->audio_bits_per_sample == 32 &&
ctx->audio_packed) {
-stream->codec->codec_id = ctx->audio_be ? AV_CODEC_ID_PCM_F32BE :
AV_CODEC_ID_PCM_F32LE;
+stream->codecpar->codec_id = ctx->audio_be ? AV_CODEC_ID_PCM_F32BE :
AV_CODEC_ID_PCM_F32LE;
} else if (basic_desc->mFormatID == kAudioFormatLinearPCM &&
ctx->audio_signed_integer &&
ctx->audio_bits_per_sample == 16 &&
ctx->audio_packed) {
-stream->codec->codec_id = ctx->audio_be ? AV_CODEC_ID_PCM_S16BE :
AV_CODEC_ID_PCM_S16LE;
+stream->codecpar->codec_id = ctx->audio_be ? AV_CODEC_ID_PCM_S16BE :
AV_CODEC_ID_PCM_S16LE;
} else if (basic_desc->mFormatID == kAudioFormatLinearPCM &&
ctx->audio_signed_integer &&
ctx->audio_bits_per_sample == 24 &&
ctx->audio_packed) {
-stream->codec->codec_id = ctx->audio_be ? AV_CODEC_ID_PCM_S24BE :
AV_CODEC_ID_PCM_S24LE;
+stream->codecpar->codec_id = ctx->audio_be ? AV_CODEC_ID_PCM_S24BE :
AV_CODEC_ID_PCM_S24LE;
} else if (basic_desc->mFormatID == kAudioFormatLinearPCM &&
ctx->audio_signed_integer &&
ctx->audio_bits_per_sample == 32 &&
ctx->audio_packed) {
-stream->codec->codec_id = ctx->audio_be ? AV_CODEC_ID_PCM_S32BE :
AV_CODEC_ID_PCM_S32LE;
+stream->codecpar->codec_id = ctx->audio_be ? AV_CODEC_ID_PCM_S32BE :
AV_CODEC_ID_PCM_S32LE;
} else {
av_log(s, AV_LOG_ERROR, "audio format is not supported\n");
return 1;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/alac: fix 20-bit support
ffmpeg | branch: master | Paul B Mahol | Thu May 5 18:13:28
2016 +0200| [c5d2d3dced64fd4fc1a5f982315fb5dbd9101d44] | committer: Paul B Mahol
avcodec/alac: fix 20-bit support
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5d2d3dced64fd4fc1a5f982315fb5dbd9101d44
---
libavcodec/alac.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index fc8bc96..548f5bd 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -391,6 +391,12 @@ static int decode_element(AVCodecContext *avctx, AVFrame
*frame, int ch_index,
*outbuffer++ = alac->output_samples_buffer[ch][i];
}}
break;
+case 20: {
+for (ch = 0; ch < channels; ch++) {
+for (i = 0; i < alac->nb_samples; i++)
+alac->output_samples_buffer[ch][i] <<= 12;
+}}
+break;
case 24: {
for (ch = 0; ch < channels; ch++) {
for (i = 0; i < alac->nb_samples; i++)
@@ -556,6 +562,7 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
switch (alac->sample_size) {
case 16: avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
break;
+case 20:
case 24:
case 32: avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
break;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] fate: Add test for vorbis encoder
ffmpeg | branch: master | Petru Rares Sincraian | Thu May 5 18:56:38 2016 +0200| [7a679e4ac099d05850d923dee235496f12ffdfa1] | committer: Michael Niedermayer fate: Add test for vorbis encoder Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a679e4ac099d05850d923dee235496f12ffdfa1 --- tests/fate/vorbis.mak |9 + 1 file changed, 9 insertions(+) diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak index 1344180..354cc57 100644 --- a/tests/fate/vorbis.mak +++ b/tests/fate/vorbis.mak @@ -1,3 +1,11 @@ +FATE_VORBIS += fate-vorbis-encode +fate-vorbis-encode: CMD = enc_dec_pcm ogg wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a vorbis -strict experimental +fate-vorbis-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav +fate-vorbis-encode: CMP_SHIFT = 0 +fate-vorbis-encode: CMP_TARGET = 296 +fate-vorbis-encode: SIZE_TOLERANCE = 3560 +fate-vorbis-encode: FUZZ = 30 + FATE_VORBIS += fate-vorbis-1 fate-vorbis-1: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/1.0.1-test_small.ogg fate-vorbis-1: REF = $(SAMPLES)/vorbis/1.0.1-test_small.pcm @@ -88,3 +96,4 @@ FATE_SAMPLES_FFPROBE += $(FATE_VORBIS_FFPROBE-yes) FATE_SAMPLES_AVCONV-$(call DEMDEC, OGG, VORBIS) += $(FATE_VORBIS) fate-vorbis: $(FATE_VORBIS) $(FATE_VORBIS_FFPROBE-yes) $(FATE_VORBIS): CMP = oneoff +fate-vorbis-encode: CMP = stddev ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vc2enc: prevent random data
ffmpeg | branch: master | Christophe Gisquet | Thu May 5 11:06:08 2016 +0200| [9c1aa14bf0b88da9f91dc114519e725cbd69180e] | committer: Rostislav Pehlivanov vc2enc: prevent random data The slice prefix is 0 in the reference encoder and the decoder ignores it. Writing 0 there seems like the best temporary solution. The padding could have contained uninitialized data, but reference VC2 encoders put 0xFF there, hence the memset value. Overall this allows producing bistreams with no random data for use by fate. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c1aa14bf0b88da9f91dc114519e725cbd69180e --- libavcodec/vc2enc.c |5 + 1 file changed, 5 insertions(+) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 6d24552..bbbeaa0 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -777,7 +777,10 @@ static int encode_hq_slice(AVCodecContext *avctx, void *arg) uint8_t quants[MAX_DWT_LEVELS][4]; int p, level, orientation; +/* The reference decoder ignores it, and its typical length is 0 */ +memset(put_bits_ptr(pb), 0, s->prefix_bytes); skip_put_bytes(pb, s->prefix_bytes); + put_bits(pb, 8, quant_idx); /* Slice quantization (slice_quantizers() in the specs) */ @@ -809,6 +812,8 @@ static int encode_hq_slice(AVCodecContext *avctx, void *arg) } pb->buf[bytes_start] = pad_s; flush_put_bits(pb); +/* vc2-reference uses that padding that decodes to '0' coeffs */ +memset(put_bits_ptr(pb), 0xFF, pad_c); skip_put_bytes(pb, pad_c); } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avutil/parsing: add '\r' as whitespace
ffmpeg | branch: master | Muhammad Faiz | Fri May 6
07:35:45 2016 +0700| [83065939cb84d79f1880bf3470e031619b55988b] | committer:
Muhammad Faiz
avutil/parsing: add '\r' as whitespace
for compatibility with platforms that treat it
as newline
Signed-off-by: Muhammad Faiz
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83065939cb84d79f1880bf3470e031619b55988b
---
libavutil/avstring.c |2 +-
libavutil/bprint.c |2 +-
libavutil/opt.c |2 +-
libavutil/version.h |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 85fb3e9..b4dace0 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -144,7 +144,7 @@ char *av_d2str(double d)
return str;
}
-#define WHITESPACES " \n\t"
+#define WHITESPACES " \n\t\r"
char *av_get_token(const char **buf, const char *term)
{
diff --git a/libavutil/bprint.c b/libavutil/bprint.c
index 0a0d078..7ef84d4 100644
--- a/libavutil/bprint.c
+++ b/libavutil/bprint.c
@@ -260,7 +260,7 @@ int av_bprint_finalize(AVBPrint *buf, char **ret_str)
return ret;
}
-#define WHITESPACES " \n\t"
+#define WHITESPACES " \n\t\r"
void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char
*special_chars,
enum AVEscapeMode mode, int flags)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index ae92da0..70a68d9 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1395,7 +1395,7 @@ int av_set_options_string(void *ctx, const char *opts,
return count;
}
-#define WHITESPACES " \n\t"
+#define WHITESPACES " \n\t\r"
static int is_key_char(char c)
{
diff --git a/libavutil/version.h b/libavutil/version.h
index 57759da..35b6374 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -64,7 +64,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 23
+#define LIBAVUTIL_VERSION_MINOR 24
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/graphparser: add '\r' as whitespace
ffmpeg | branch: master | Muhammad Faiz | Fri May 6 07:37:12 2016 +0700| [1d4400ac7fb057cbfff62ab4ce72e7b19c68f929] | committer: Muhammad Faiz avfilter/graphparser: add '\r' as whitespace for compatibility with platforms that treat it as newline Signed-off-by: Muhammad Faiz > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d4400ac7fb057cbfff62ab4ce72e7b19c68f929 --- libavfilter/graphparser.c |2 +- libavfilter/version.h |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 8d15b5d..ce5be1b 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -27,7 +27,7 @@ #include "libavutil/mem.h" #include "avfilter.h" -#define WHITESPACES " \n\t" +#define WHITESPACES " \n\t\r" /** * Link two filters together. diff --git a/libavfilter/version.h b/libavfilter/version.h index d7f9c54..1a9c4ac 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 44 +#define LIBAVFILTER_VERSION_MINOR 45 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec: Add "sar" alias to "aspect" option of video encoders
ffmpeg | branch: master | Andrey Utkin | Thu May 5
15:37:49 2016 +0300| [abb69a2f2ba830c0f2557663915a38a9e5b57e61] | committer:
Michael Niedermayer
avcodec: Add "sar" alias to "aspect" option of video encoders
It is impossible to pass "aspect" parameter to encoder from ffmpeg CLI
because option from lavc/options_table.h is eclipsed by option with same
name in ffmpeg_opt.c, which has different meaning (DAR, not SAR).
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abb69a2f2ba830c0f2557663915a38a9e5b57e61
---
doc/codecs.texi |3 +++
libavcodec/options_table.h |1 +
tests/ref/fate/api-mjpeg-codec-param |2 ++
tests/ref/fate/api-png-codec-param |2 ++
4 files changed, 8 insertions(+)
diff --git a/doc/codecs.texi b/doc/codecs.texi
index ad99fa6..a18ce8d 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -456,6 +456,9 @@ Possible values:
@item aspect @var{rational number} (@emph{encoding,video})
Set sample aspect ratio.
+@item sar @var{rational number} (@emph{encoding,video})
+Set sample aspect ratio. Alias to @var{aspect}.
+
@item debug @var{flags} (@emph{decoding/encoding,audio,video,subtitles})
Print specific debug info.
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 9be2338..262ea98 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -254,6 +254,7 @@ static const AVOption avcodec_options[] = {
{"median", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PRED_MEDIAN }, INT_MIN,
INT_MAX, V|E, "pred"},
#endif
{"aspect", "sample aspect ratio", OFFSET(sample_aspect_ratio),
AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E},
+{"sar","sample aspect ratio", OFFSET(sample_aspect_ratio),
AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, 10, V|E},
{"debug", "print specific debug info", OFFSET(debug), AV_OPT_TYPE_FLAGS, {.i64
= DEFAULT }, 0, INT_MAX, V|A|S|E|D, "debug"},
{"pict", "picture info", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_PICT_INFO },
INT_MIN, INT_MAX, V|D, "debug"},
{"rc", "rate control", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_RC }, INT_MIN,
INT_MAX, V|E, "debug"},
diff --git a/tests/ref/fate/api-mjpeg-codec-param
b/tests/ref/fate/api-mjpeg-codec-param
index 26822fd..c67d1b1 100644
--- a/tests/ref/fate/api-mjpeg-codec-param
+++ b/tests/ref/fate/api-mjpeg-codec-param
@@ -62,6 +62,7 @@ stream=0, decode=0
bits_per_coded_sample=0
pred=0
aspect=180/180
+sar=180/180
debug=0x
vismv=0x
cmp=0
@@ -218,6 +219,7 @@ stream=0, decode=1
bits_per_coded_sample=0
pred=0
aspect=180/180
+sar=180/180
debug=0x
vismv=0x
cmp=0
diff --git a/tests/ref/fate/api-png-codec-param
b/tests/ref/fate/api-png-codec-param
index 46ac8eb..bd53441 100644
--- a/tests/ref/fate/api-png-codec-param
+++ b/tests/ref/fate/api-png-codec-param
@@ -62,6 +62,7 @@ stream=0, decode=0
bits_per_coded_sample=0
pred=0
aspect=2835/2835
+sar=2835/2835
debug=0x
vismv=0x
cmp=0
@@ -218,6 +219,7 @@ stream=0, decode=1
bits_per_coded_sample=0
pred=0
aspect=2835/2835
+sar=2835/2835
debug=0x
vismv=0x
cmp=0
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/dcadsp: use LOCAL_ALIGNED_32 instead of LOCAL_ALIGNED(32, ...)
ffmpeg | branch: master | James Almer | Fri May 6 00:47:55
2016 -0300| [bd63ecec78207c3c8d3b377c37aa81f56f30a761] | committer: James Almer
avcodec/dcadsp: use LOCAL_ALIGNED_32 instead of LOCAL_ALIGNED(32, ...)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd63ecec78207c3c8d3b377c37aa81f56f30a761
---
libavcodec/dcadsp.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c
index 09faee5..25a2039 100644
--- a/libavcodec/dcadsp.c
+++ b/libavcodec/dcadsp.c
@@ -122,7 +122,7 @@ static void sub_qmf32_float_c(SynthFilterContext *synth,
const float *filter_coeff, ptrdiff_t npcmblocks,
float scale)
{
-LOCAL_ALIGNED(32, float, input, [32]);
+LOCAL_ALIGNED_32(float, input, [32]);
int i, j;
for (j = 0; j < npcmblocks; j++) {
@@ -151,7 +151,7 @@ static void sub_qmf64_float_c(SynthFilterContext *synth,
const float *filter_coeff, ptrdiff_t npcmblocks,
float scale)
{
-LOCAL_ALIGNED(32, float, input, [64]);
+LOCAL_ALIGNED_32(float, input, [64]);
int i, j;
if (!subband_samples_hi)
@@ -243,7 +243,7 @@ static void sub_qmf32_fixed_c(SynthFilterContext *synth,
int32_t *hist1, int *offset, int32_t *hist2,
const int32_t *filter_coeff, ptrdiff_t
npcmblocks)
{
-LOCAL_ALIGNED(32, int32_t, input, [32]);
+LOCAL_ALIGNED_32(int32_t, input, [32]);
int i, j;
for (j = 0; j < npcmblocks; j++) {
@@ -267,7 +267,7 @@ static void sub_qmf64_fixed_c(SynthFilterContext *synth,
int32_t *hist1, int *offset, int32_t *hist2,
const int32_t *filter_coeff, ptrdiff_t
npcmblocks)
{
-LOCAL_ALIGNED(32, int32_t, input, [64]);
+LOCAL_ALIGNED_32(int32_t, input, [64]);
int i, j;
if (!subband_samples_hi)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
