diff options
| author | wm4 <wm4@nowhere> | 2015-06-24 14:18:51 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-06-24 14:18:51 +0200 |
| commit | fcd589b12393614d684c890917f9aac794aa325a (patch) | |
| tree | 4f878d0389f1baaffa718305966737ccdf5de38b /demux/demux_lavf.c | |
| parent | ae2873f72e90c948da1ed32af3e30e0cd6cef409 (diff) | |
| download | mpv-fcd589b12393614d684c890917f9aac794aa325a.tar.bz2 mpv-fcd589b12393614d684c890917f9aac794aa325a.tar.xz | |
demux: get rid of some bstr things
Change the demuxer_add_attachment() and demuxer_add_chapter() signatures
to take char* instead of bstr, and everything which depends on it.
Diffstat (limited to 'demux/demux_lavf.c')
| -rw-r--r-- | demux/demux_lavf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 5689246114..0e868668c6 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -618,9 +618,8 @@ static void handle_stream(demuxer_t *demuxer, int i) AVDictionaryEntry *mt = av_dict_get(st->metadata, "mimetype", NULL, 0); char *mimetype = mt ? mt->value : NULL; if (mimetype) { - demuxer_add_attachment(demuxer, bstr0(filename), bstr0(mimetype), - (struct bstr){codec->extradata, - codec->extradata_size}); + demuxer_add_attachment(demuxer, filename, mimetype, + codec->extradata, codec->extradata_size); } break; } @@ -808,7 +807,7 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) for (i = 0; i < avfc->nb_chapters; i++) { AVChapter *c = avfc->chapters[i]; t = av_dict_get(c->metadata, "title", NULL, 0); - int index = demuxer_add_chapter(demuxer, t ? bstr0(t->value) : bstr0(""), + int index = demuxer_add_chapter(demuxer, t ? t : "", c->start * av_q2d(c->time_base), i); mp_tags_copy_from_av_dictionary(demuxer->chapters[index].metadata, c->metadata); } |