Browse Source

lavf/ape: Fix stream duration calculation

Fixes ticket #1662

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.0
jamal Michael Niedermayer 13 years ago
parent
commit
732dfc7660
1 changed files with 3 additions and 5 deletions
  1. +3
    -5
      libavformat/ape.c

+ 3
- 5
libavformat/ape.c View File

@@ -38,8 +38,6 @@
#define MAC_FORMAT_FLAG_HAS_SEEK_ELEMENTS 16 // has the number of seek elements after the peak level
#define MAC_FORMAT_FLAG_CREATE_WAV_HEADER 32 // create the wave header on decompression (not stored)

#define MAC_SUBFRAME_SIZE 4608

#define APE_EXTRADATA_SIZE 6

typedef struct {
@@ -335,8 +333,8 @@ static int ape_read_header(AVFormatContext * s)

st->nb_frames = ape->totalframes;
st->start_time = 0;
st->duration = total_blocks / MAC_SUBFRAME_SIZE;
avpriv_set_pts_info(st, 64, MAC_SUBFRAME_SIZE, ape->samplerate);
st->duration = total_blocks;
avpriv_set_pts_info(st, 64, 1, ape->samplerate);

st->codec->extradata = av_malloc(APE_EXTRADATA_SIZE);
st->codec->extradata_size = APE_EXTRADATA_SIZE;
@@ -348,7 +346,7 @@ static int ape_read_header(AVFormatContext * s)
for (i = 0; i < ape->totalframes; i++) {
ape->frames[i].pts = pts;
av_add_index_entry(st, ape->frames[i].pos, ape->frames[i].pts, 0, 0, AVINDEX_KEYFRAME);
pts += ape->blocksperframe / MAC_SUBFRAME_SIZE;
pts += ape->blocksperframe;
}

/* try to read APE tags */


Loading…
Cancel
Save