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
/
g722enc.c
diff --git
a/ffmpeg/libavcodec/g722enc.c
b/ffmpeg/libavcodec/g722enc.c
index c4d6c7b853ba2a1988ac35ef864ad3fcb1090d07..dac7c8776846230f035e49755d561e155a863f03 100644
(file)
--- a/
ffmpeg/libavcodec/g722enc.c
+++ b/
ffmpeg/libavcodec/g722enc.c
@@
-107,7
+107,7
@@
static av_cold int g722_encode_init(AVCodecContext * avctx)
a common packet size for VoIP applications */
avctx->frame_size = 320;
}
a common packet size for VoIP applications */
avctx->frame_size = 320;
}
- avctx->
delay
= 22;
+ avctx->
initial_padding
= 22;
if (avctx->trellis) {
/* validate trellis */
if (avctx->trellis) {
/* validate trellis */
@@
-374,7
+374,7
@@
static int g722_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
}
if (frame->pts != AV_NOPTS_VALUE)
}
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;
}