diff options
| author | wm4 <wm4@mplayer2.org> | 2012-07-28 23:47:42 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-07-28 23:47:42 +0200 |
| commit | 08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e (patch) | |
| tree | e6a6c3a2042231651ec2f622e312657da900280b /libmpdemux/demux_lavf.c | |
| parent | ca0979a5db442ae212c92a34dcbd97101eb5e51c (diff) | |
| download | mpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.bz2 mpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.xz | |
bstr: rename bstr() function to bstr0(), and typedef bstr to struct bstr
Replace all uses of bstr() with bstr0().
Also remove the ridiculous C++ workaround.
Diffstat (limited to 'libmpdemux/demux_lavf.c')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 1487a6db6b..79d5a3c420 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -524,8 +524,8 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) NULL, 0); char *filename = ftag ? ftag->value : NULL; if (st->codec->codec_id == CODEC_ID_TTF) - demuxer_add_attachment(demuxer, bstr(filename), - bstr("application/x-truetype-font"), + demuxer_add_attachment(demuxer, bstr0(filename), + bstr0("application/x-truetype-font"), (struct bstr){codec->extradata, codec->extradata_size}); break; @@ -644,7 +644,7 @@ static demuxer_t *demux_open_lavf(demuxer_t *demuxer) uint64_t end = av_rescale_q(c->end, c->time_base, (AVRational){1, 1000000000}); t = av_dict_get(c->metadata, "title", NULL, 0); - demuxer_add_chapter(demuxer, t ? bstr(t->value) : bstr(NULL), + demuxer_add_chapter(demuxer, t ? bstr0(t->value) : bstr0(NULL), start, end); } |