xine-lib:fix head

2016-06-14 00:44:15 +03:00
parent f24632cfc6
commit 2a4146ecb7
2 changed files with 0 additions and 8 deletions
@@ -52,8 +52,4 @@ 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,
-<<<<<<< HEAD
       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
-=======
-       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
->>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129
@@ -138,11 +138,7 @@

    <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>