#include "libavcodec/get_bits.h"
#include "avformat.h"
+#include "internal.h"
#include "id3v1.h"
+#include "libavutil/dict.h"
typedef struct {
int totalframes, currentframe;
int i, channels, bps, samplerate, datalen, framelen;
uint64_t framepos, start_offset;
- if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
+ if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX))
ff_id3v1_read(s);
start_offset = avio_tell(s->pb);
return -1;
}
- st = av_new_stream(s, 0);
+ st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
- av_set_pts_info(st, 64, 1, samplerate);
+ avpriv_set_pts_info(st, 64, 1, samplerate);
st->start_time = 0;
st->duration = datalen;
return -1;
}
st->codec->extradata = av_mallocz(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!st->codec->extradata) {
+ st->codec->extradata_size = 0;
+ return AVERROR(ENOMEM);
+ }
avio_seek(s->pb, start_offset, SEEK_SET);
avio_read(s->pb, st->codec->extradata, st->codec->extradata_size);
int size, ret;
// FIXME!
- if (c->currentframe > c->totalframes)
- return -1;
+ if (c->currentframe >= c->totalframes)
+ return AVERROR_EOF;
size = st->index_entries[c->currentframe].size;
}
AVInputFormat ff_tta_demuxer = {
- "tta",
- NULL_IF_CONFIG_SMALL("True Audio"),
- sizeof(TTAContext),
- tta_probe,
- tta_read_header,
- tta_read_packet,
- NULL,
- tta_read_seek,
+ .name = "tta",
+ .long_name = NULL_IF_CONFIG_SMALL("True Audio"),
+ .priv_data_size = sizeof(TTAContext),
+ .read_probe = tta_probe,
+ .read_header = tta_read_header,
+ .read_packet = tta_read_packet,
+ .read_seek = tta_read_seek,
.extensions = "tta",
};