stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

transcoding: fix compile error when using libav, fixes #2708

Browse source 
AVCodecContext.framerate and av_make_q() are only available since ffmpeg 2.5 and not available in libav
This commit is contained in:
stbenz 2015-03-10 09:28:38 +01:00 • committed by Jaroslav Kysela
parent bd06d3c79a
commit 96898a66e9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/plumbing/transcoding.c
View file

@ -1032,11 +1032,11 @@ transcoder_stream_video(transcoder_t *t, transcoder_stream_t *ts, th_pkt_t *pkt)
// Encoder uses "time_base" for bitrate calculation, but "time_base" from decoder
// will be deprecated in the future, therefore calculate "time_base" from "framerate" if available.
octx->ticks_per_frame = ictx->ticks_per_frame;
if (ictx->framerate.num != 0 && ictx->framerate.den != 0) {
octx->time_base = av_inv_q(av_mul_q(ictx->framerate, av_make_q(ictx->ticks_per_frame, 1)));
} else {
octx->time_base = ictx->time_base;
}
#if LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(56, 13, 100) // ffmpeg 2.5
octx->time_base = av_inv_q(av_mul_q(ictx->framerate, av_make_q(ictx->ticks_per_frame, 1)));
#else
octx->time_base = ictx->time_base;
#endif
switch (ts->ts_type) {
case SCT_MPEG2VIDEO: