diff options
| author | piernov <piernov@piernov.org> | 2011-08-23 16:58:34 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2011-08-23 16:58:34 +0200 |
| commit | 52153ceefdf541f96dfa5d80c1bc287ba3367e4d (patch) | |
| tree | f78b6fea5ad11295736b799a513a0690f98a9137 /opal/opal-3.10.1-ffmpeg0.8.patch | |
| parent | 75466005e1205976f5f344527fe9d6607bf4e525 (diff) | |
| download | gnome3-52153ceefdf541f96dfa5d80c1bc287ba3367e4d.tar.gz gnome3-52153ceefdf541f96dfa5d80c1bc287ba3367e4d.tar.bz2 gnome3-52153ceefdf541f96dfa5d80c1bc287ba3367e4d.tar.xz gnome3-52153ceefdf541f96dfa5d80c1bc287ba3367e4d.zip | |
opal 3.10.2-1 màj port
Diffstat (limited to 'opal/opal-3.10.1-ffmpeg0.8.patch')
| -rw-r--r-- | opal/opal-3.10.1-ffmpeg0.8.patch | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/opal/opal-3.10.1-ffmpeg0.8.patch b/opal/opal-3.10.1-ffmpeg0.8.patch index c675d8a..f351885 100644 --- a/opal/opal-3.10.1-ffmpeg0.8.patch +++ b/opal/opal-3.10.1-ffmpeg0.8.patch @@ -1,36 +1,6 @@ ---- 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 @@ +@@ -806,7 +806,7 @@ } else // No IFrame requested, let avcodec decide what to do { @@ -39,3 +9,4 @@ } // Encode a frame + |