opps

multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch

@@ -52,4 +52,8 @@ Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
 +  this->picture = av_frame_alloc();
    if (!this->picture) {
      xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
-       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
+<<<<<<< HEAD
+       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
+=======
+       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
+>>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129

multimedia/video/xine-lib/pspec.xml

@@ -65,6 +65,7 @@
             <Patch level="1">tr_segfault_fix.patch</Patch>
             <Patch level="1">deepbind.patch</Patch>
             <Patch level="1">lpthread.patch</Patch>
+            <Patch level="1">xine-lib-ffmpeg3.patch</Patch>
         </Patches>
     </Source>
 
@@ -137,7 +138,11 @@
 
     <History>
         <Update release="2">
+<<<<<<< HEAD
             <Date>2016-06-14</Date>
+=======
+            <Date>2016-06-13</Date>
+>>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129
             <Version>1.2.6</Version>
             <Comment>Release Bump.</Comment>
             <Name>Pisi Linux Community</Name>