packages (OPAL_3_6): opal/opal-ffmpeg08.patch - same for mpeg plugin

[lisu]

Author: lisu                         Date: Fri Jul  1 08:28:38 2011 GMT
Module: packages                      Tag: OPAL_3_6
---- Log message:
- same for mpeg plugin

---- Files affected:
packages/opal:
   opal-ffmpeg08.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: packages/opal/opal-ffmpeg08.patch
diff -u packages/opal/opal-ffmpeg08.patch:1.1.2.2 packages/opal/opal-ffmpeg08.patch:1.1.2.3
--- packages/opal/opal-ffmpeg08.patch:1.1.2.2	Fri Jul  1 10:20:28 2011
+++ packages/opal/opal-ffmpeg08.patch	Fri Jul  1 10:28:33 2011
@@ -196,3 +196,27 @@
   
    _txH263PFrame->BeginNewFrame();
    _txH263PFrame->SetTimestamp(srcRTP.GetTimestamp());
+--- opal-3.6.8/plugins/video/MPEG4-ffmpeg/mpeg4.cxx~	2010-05-27 08:52:47.000000000 +0200
++++ opal-3.6.8/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2011-07-01 10:27:44.590440941 +0200
+@@ -828,11 +828,7 @@
+         // Should the next frame be an I-Frame?
+         if ((flags & PluginCodec_CoderForceIFrame) || (_frameNum == 0))
+         {
+-            _avpicture->pict_type = FF_I_TYPE;
+-        }
+-        else // No IFrame requested, let avcodec decide what to do
+-        {
+-            _avpicture->pict_type = 0;
++            _avpicture->pict_type = AV_PICTURE_TYPE_I;
+         }
+ 
+         // Encode a frame
+@@ -1363,7 +1359,7 @@
+     if (_doError) {
+         int errors = 0;
+         MpegEncContext *s = (MpegEncContext *) _avcontext->priv_data;
+-        if (s->error_count && _avcontext->coded_frame->pict_type == FF_I_TYPE) {
++        if (s->error_count && _avcontext->coded_frame->pict_type == AV_PICTURE_TYPE_I) {
+             const uint8_t badflags = AC_ERROR | DC_ERROR | MV_ERROR;
+             for (int i = 0; i < s->mb_num && errors < threshold; ++i) {
+                 if (s->error_status_table[s->mb_index2xy[i]] & badflags)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opal/opal-ffmpeg08.patch?r1=1.1.2.2&r2=1.1.2.3&f=u