diff options
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavcodec/mpc8.c | 7 | ||||
| -rw-r--r-- | libavformat/mpc8.c | 7 |
3 files changed, 14 insertions, 5 deletions
@@ -2923,7 +2923,10 @@ case $target_os in SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' - SHFLAGS='-shared -Wl,--enable-auto-image-base' + SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)' + SLIB_INSTALL_LINKS= + SLIB_INSTALL_EXTRA_LIB='lib$(FULLNAME).dll.a' + SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a' objformat="win32" enable dos_paths check_cflags -fno-common diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index d9594ec900..cb952ca039 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -428,6 +428,12 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data, return c->cur_frame ? c->last_bits_used >> 3 : buf_size; } +static av_cold void mpc8_decode_flush(AVCodecContext *avctx) +{ + MPCContext *c = avctx->priv_data; + c->cur_frame = 0; +} + AVCodec ff_mpc8_decoder = { .name = "mpc8", .type = AVMEDIA_TYPE_AUDIO, @@ -435,6 +441,7 @@ AVCodec ff_mpc8_decoder = { .priv_data_size = sizeof(MPCContext), .init = mpc8_decode_init, .decode = mpc8_decode_frame, + .flush = mpc8_decode_flush, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"), }; diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 0b1f6b6e49..28b64325e7 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -49,7 +49,6 @@ static const int mpc8_rate[8] = { 44100, 48000, 37800, 32000, -1, -1, -1, -1 }; typedef struct { int ver; - int frame; int64_t header_pos; int64_t samples; @@ -240,6 +239,7 @@ static int mpc8_read_header(AVFormatContext *s) st->codec->channels = (st->codec->extradata[1] >> 4) + 1; st->codec->sample_rate = mpc8_rate[st->codec->extradata[0] >> 5]; avpriv_set_pts_info(st, 32, 1152 << (st->codec->extradata[1]&3)*2, st->codec->sample_rate); + st->start_time = 0; st->duration = c->samples / (1152 << (st->codec->extradata[1]&3)*2); size -= avio_tell(pb) - pos; if (size > 0) @@ -274,7 +274,7 @@ static int mpc8_read_packet(AVFormatContext *s, AVPacket *pkt) if(av_get_packet(s->pb, pkt, size) < 0) return AVERROR(ENOMEM); pkt->stream_index = 0; - pkt->pts = c->frame++; + pkt->duration = 1; return 0; } if(tag == TAG_STREAMEND) @@ -287,13 +287,12 @@ static int mpc8_read_packet(AVFormatContext *s, AVPacket *pkt) static int mpc8_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { AVStream *st = s->streams[stream_index]; - MPCContext *c = s->priv_data; int index = av_index_search_timestamp(st, timestamp, flags); if(index < 0) return -1; if (avio_seek(s->pb, st->index_entries[index].pos, SEEK_SET) < 0) return -1; - c->frame = st->index_entries[index].timestamp; + ff_update_cur_dts(s, st, st->index_entries[index].timestamp); return 0; } |