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/demuxer.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/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 276d62dbae..9aaed21a8f 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1227,7 +1227,7 @@ int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param) { - return demux_info_add_bstr(demuxer, BSTR(opt), BSTR(param)); + return demux_info_add_bstr(demuxer, bstr(opt), bstr(param)); } int demux_info_add_bstr(demuxer_t *demuxer, struct bstr opt, struct bstr param) @@ -1237,8 +1237,8 @@ int demux_info_add_bstr(demuxer_t *demuxer, struct bstr opt, struct bstr param) for (n = 0; info && info[2 * n] != NULL; n++) { - if (!bstrcasecmp(opt, BSTR(info[2*n]))) { - if (!bstrcmp(param, BSTR(info[2*n + 1]))) { + if (!bstrcasecmp(opt, bstr(info[2*n]))) { + if (!bstrcmp(param, bstr(info[2*n + 1]))) { mp_msg(MSGT_DEMUX, MSGL_V, "Demuxer info %.*s set to unchanged value %.*s\n", BSTR_P(opt), BSTR_P(param)); return 0; |