diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-07-27 08:38:12 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-27 08:38:12 +0300 |
| commit | 0958620591375b41a8d21dd2a3501e1c9e5e9cba (patch) | |
| tree | bbfcf29330c7408cd1991f3a81138c9bbba81419 /libmpdemux/demux_lavf.c | |
| parent | ea4cc89f36e064b3224d633df8bc08cc49178d51 (diff) | |
| download | mpv-0958620591375b41a8d21dd2a3501e1c9e5e9cba.tar.bz2 mpv-0958620591375b41a8d21dd2a3501e1c9e5e9cba.tar.xz | |
bstr: rename BSTR() -> bstr()
Rename the BSTR() function to bstr(). The former caused a conflict
with some Windows OS name, and it's no longer a macro so uppercase
naming is less appropriate.
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 545e3bdace..2da898bf5c 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -503,8 +503,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, bstr(filename), + bstr("application/x-truetype-font"), (struct bstr){codec->extradata, codec->extradata_size}); break; @@ -630,7 +630,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_metadata_get(c->metadata, "title", NULL, 0); - demuxer_add_chapter(demuxer, t ? BSTR(t->value) : BSTR(NULL), + demuxer_add_chapter(demuxer, t ? bstr(t->value) : bstr(NULL), start, end); } |