diff options
| author | Martin Storsjö <martin@martin.st> | 2012-01-26 21:37:38 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-02-26 09:09:26 +0100 |
| commit | fc89f15497c2b5b78a992c98eaba9fca7cc82f8f (patch) | |
| tree | a65d0a9b694f7535238bb17549893ca52cebe8a1 /libavcodec/utils.c | |
| parent | e364f507183634a9134eea0e004c8ae448e54469 (diff) | |
| download | ffmpeg-fc89f15497c2b5b78a992c98eaba9fca7cc82f8f.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>
(cherry picked from commit 9a7dc618c50902e7a171f2deda6430d52c277a95)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec/utils.c')
| -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 5109bf8b31..f64bff8ff6 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -744,6 +744,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD avctx->error_recognition, avctx->err_recognition); #endif + 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) { |