diff options
| author | Martin Storsjö <martin@martin.st> | 2012-01-26 21:37:38 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-01-27 20:52:32 +0200 |
| commit | 9a7dc618c50902e7a171f2deda6430d52c277a95 (patch) | |
| tree | b153b9abee5baf274561e8ef27b52896de55a2ec | |
| parent | bca77a1a64a658beb616adcdd59fb3000c7a737b (diff) | |
| download | ffmpeg-9a7dc618c50902e7a171f2deda6430d52c277a95.tar.gz | |
libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
Earlier, calling avcodec_encode_audio worked fine even if time_base
wasn't set. Now it crashes due to trying to scale the output pts to
the codec context time base. This affects e.g. VLC.
If no time_base is set for audio codecs, set it to the sample
rate.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/utils.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index fadfb0c0aa..707ecb5fef 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -714,6 +714,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD } avctx->frame_number = 0; + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && + (!avctx->time_base.num || !avctx->time_base.den)) { + avctx->time_base.num = 1; + avctx->time_base.den = avctx->sample_rate; + } + if (HAVE_THREADS && !avctx->thread_opaque) { ret = ff_thread_init(avctx); if (ret < 0) { |