repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
ac3enc_template.c
diff --git
a/ffmpeg/libavcodec/ac3enc_template.c
b/ffmpeg/libavcodec/ac3enc_template.c
index f1f81da290ffbe286f006a5794772c23c530bbfe..c3ad76f4295dbec09c742f40ec98a4ef8e8923de 100644
(file)
--- a/
ffmpeg/libavcodec/ac3enc_template.c
+++ b/
ffmpeg/libavcodec/ac3enc_template.c
@@
-108,7
+108,7
@@
static void apply_mdct(AC3EncodeContext *s)
const SampleType *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE];
#if CONFIG_AC3ENC_FLOAT
const SampleType *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE];
#if CONFIG_AC3ENC_FLOAT
- s->fdsp
.
vector_fmul(s->windowed_samples, input_samples,
+ s->fdsp
->
vector_fmul(s->windowed_samples, input_samples,
s->mdct_window, AC3_WINDOW_SIZE);
#else
s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples,
s->mdct_window, AC3_WINDOW_SIZE);
#else
s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples,
@@
-443,7
+443,7
@@
int AC3_NAME(encode_frame)(AVCodecContext *avctx, AVPacket *avpkt,
ff_ac3_output_frame(s, avpkt->data);
if (frame->pts != AV_NOPTS_VALUE)
ff_ac3_output_frame(s, avpkt->data);
if (frame->pts != AV_NOPTS_VALUE)
- avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->
delay
);
+ avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->
initial_padding
);
*got_packet_ptr = 1;
return 0;
*got_packet_ptr = 1;
return 0;