blob: c675d8a0560e0a263e0c82a77527cad02351c4c3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
--- plugins/video/H.263-1998/h263-1998.cxx.ffmpeg 2011-07-20 21:44:12.000000000 +0200
+++ plugins/video/H.263-1998/h263-1998.cxx 2011-07-20 22:17:36.000000000 +0200
@@ -334,9 +334,6 @@
_context->qmax = round ( (31.0 - H263P_MIN_QUANT) / 31.0 * tsto + H263P_MIN_QUANT);
_context->qmax = std::min( _context->qmax, 31);
- _context->mb_qmin = _context->qmin;
- _context->mb_qmax = _context->qmax;
-
// Lagrange multipliers - this is how the context defaults do it:
_context->lmin = _context->qmin * FF_QP2LAMBDA;
_context->lmax = _context->qmax * FF_QP2LAMBDA;
@@ -660,7 +657,7 @@
_inputFrame->data[1] = _inputFrame->data[0] + size;
_inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
+ _inputFrame->pict_type = (AVPictureType)((flags && forceIFrame) ? FF_I_TYPE : 0);
currentMb = 0;
currentBytes = 0;
@@ -863,7 +860,7 @@
_inputFrame->data[0] = _inputFrameBuffer + FF_INPUT_BUFFER_PADDING_SIZE;
_inputFrame->data[1] = _inputFrame->data[0] + size;
_inputFrame->data[2] = _inputFrame->data[1] + (size / 4);
- _inputFrame->pict_type = (flags && forceIFrame) ? FF_I_TYPE : 0;
+ _inputFrame->pict_type = (AVPictureType)((flags && forceIFrame) ? FF_I_TYPE : 0);
_txH263PFrame->BeginNewFrame();
_txH263PFrame->SetTimestamp(srcRTP.GetTimestamp());
--- plugins/video/MPEG4-ffmpeg/mpeg4.cxx.ffmpeg 2011-07-20 22:24:03.000000000 +0200
+++ plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2011-07-20 22:24:35.000000000 +0200
@@ -808,7 +808,7 @@
}
else // No IFrame requested, let avcodec decide what to do
{
- m_avpicture->pict_type = 0;
+ m_avpicture->pict_type = (AVPictureType)0;
}
// Encode a frame
|
