diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 19:23:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 19:23:00 +0200 |
| commit | 25f4e9387d0efd6fe2ac51d78eb681c542a6f82d (patch) | |
| tree | 436efd419bb560e735df6afd621be3fd8a95636d /libavcodec/ratecontrol.c | |
| parent | ae6ba2db8ff811fa1fe23c5abffcc8086dcbc052 (diff) | |
| parent | 530c1441fd1426b6a4bb33485ff3226e1ae0ad45 (diff) | |
| download | ffmpeg-25f4e9387d0efd6fe2ac51d78eb681c542a6f82d.tar.gz | |
Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'
* commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45':
lavc: make lmax/lmin into private options of mpegvideo encoders
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 12c3e45ef5..d05e2ee629 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -477,8 +477,8 @@ static double get_diff_limited_q(MpegEncContext *s, RateControlEntry *rce, doubl */ static void get_qminmax(int *qmin_ret, int *qmax_ret, MpegEncContext *s, int pict_type) { - int qmin = s->avctx->lmin; - int qmax = s->avctx->lmax; + int qmin = s->lmin; + int qmax = s->lmax; assert(qmin <= qmax); |