summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorRudolf Polzer <divVerent@xonotic.org>2014-07-23 16:09:44 +0200
committerRudolf Polzer <divVerent@xonotic.org>2014-07-23 16:09:44 +0200
commitc19ec6f6f6e77ba713f8ae6f25b68c6eaef46973 (patch)
tree7949d8c58a482e69c2407a055e0bbb8b0fb6a8ef /audio
parent843f5f47233956cfc03ea656c85771323bc7a1a2 (diff)
downloadmpv-c19ec6f6f6e77ba713f8ae6f25b68c6eaef46973.tar.bz2
mpv-c19ec6f6f6e77ba713f8ae6f25b68c6eaef46973.tar.xz
encode: deal even more with codec->time_base deprecation.
I assume this works too with Libav 10 and FFmpeg d3e51b41.
Diffstat (limited to 'audio')
-rw-r--r--audio/out/ao_lavc.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index 72e98655c1..34cf2c21ac 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -114,12 +114,11 @@ static int init(struct ao *ao)
codec = encode_lavc_get_codec(ao->encode_lavc_ctx, ac->stream);
- // ac->stream->time_base.num = 1;
- // ac->stream->time_base.den = ao->samplerate;
- // doing this breaks mpeg2ts in ffmpeg
- // which doesn't properly force the time base to be 90000
- // furthermore, ffmpeg.c doesn't do this either and works
-
+ // TODO: Remove this redundancy with encode_lavc_alloc_stream also
+ // setting the time base.
+ // Using codec->time_bvase is deprecated, but needed for older lavf.
+ ac->stream->time_base.num = 1;
+ ac->stream->time_base.den = ao->samplerate;
ac->stream->codec->time_base.num = 1;
ac->stream->codec->time_base.den = ao->samplerate;