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
/
h264_slice.c
diff --git
a/ffmpeg/libavcodec/h264_slice.c
b/ffmpeg/libavcodec/h264_slice.c
index c46cc2453cfc9afdcfa7d82c9963f0cba28c0387..53f61caa7df78fd23d43018766bbf5bdb2995b62 100644
(file)
--- a/
ffmpeg/libavcodec/h264_slice.c
+++ b/
ffmpeg/libavcodec/h264_slice.c
@@
-1181,8
+1181,8
@@
static int h264_slice_header_init(H264Context *h, int reinit)
int64_t den = h->sps.time_scale;
if (h->x264_build < 44U)
den *= 2;
int64_t den = h->sps.time_scale;
if (h->x264_build < 44U)
den *= 2;
- av_reduce(&h->avctx->
time_base.num, &h->avctx->time_base.den
,
- h->sps.num_units_in_tick, den, 1 << 30);
+ av_reduce(&h->avctx->
framerate.den, &h->avctx->framerate.num
,
+ h->sps.num_units_in_tick
* h->avctx->ticks_per_frame
, den, 1 << 30);
}
if (reinit)
}
if (reinit)