[SCM] libav/experimental: Another variable that did nothing at all

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7669935ac40b83c4d82f609e294b2a1bef9ee8c1
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Jun 26 22:43:18 2008 +0000

    Another variable that did nothing at all
    
    Originally committed as revision 13998 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index 15be3b3..d426cd7 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -62,8 +62,6 @@ typedef struct StrDemuxContext {
 
     /* a STR file can contain up to 32 channels of data */
     StrChannel channels[32];
-
-    int64_t pts;
 } StrDemuxContext;
 
 static const char sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00};
@@ -117,9 +115,6 @@ static int str_read_header(AVFormatContext *s,
     int i;
     int channel;
 
-    /* initialize context members */
-    str->pts = 0;
-
     /* skip over any RIFF header */
     if (get_buffer(pb, sector, RIFF_HEADER_SIZE) != RIFF_HEADER_SIZE)
         return AVERROR(EIO);
@@ -259,12 +254,6 @@ static int str_read_packet(AVFormatContext *s,
                     pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE;
                     pkt->stream_index =
                         str->channels[channel].video_stream_index;
-               //     pkt->pts = str->pts;
-
-                    /* if there is no audio, adjust the pts after every video
-                     * frame; assume 15 fps */
-                   if (0)
-                       str->pts += (90000 / 15);
                 }
 
                 memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
@@ -294,7 +283,6 @@ printf (" dropping audio sector\n");
 
                 pkt->stream_index =
                     str->channels[channel].audio_stream_index;
-                //pkt->pts = str->pts;
                 return 0;
 #endif
             break;

-- 
Libav/FFmpeg packaging