summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorMarcoen Hirschberg <m.hirschberg@activevideo.com>2014-05-27 00:15:41 +0200
committerwm4 <wm4@nowhere>2014-05-28 21:37:50 +0200
commit434242adb5dc045faf16f8bb19aa740732cc3345 (patch)
treeaf5d64f31973a33b70ba23e17cd8e59ee9134702 /player
parent6e58b20cced05c303f1b35d5baa5f79b8ad612f5 (diff)
downloadmpv-434242adb5dc045faf16f8bb19aa740732cc3345.tar.bz2
mpv-434242adb5dc045faf16f8bb19aa740732cc3345.tar.xz
audio: rename i_bps to 'bitrate' to avoid confusion
Since i_bps now contains bits/sec, rename it to reflect this change.
Diffstat (limited to 'player')
-rw-r--r--player/command.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/player/command.c b/player/command.c
index 7e391e673f..bf18d2fb9e 100644
--- a/player/command.c
+++ b/player/command.c
@@ -1198,10 +1198,10 @@ static int mp_property_audio_bitrate(m_option_t *prop, int action,
return M_PROPERTY_UNAVAILABLE;
switch (action) {
case M_PROPERTY_PRINT:
- *(char **)arg = format_bitrate(mpctx->d_audio->i_bps);
+ *(char **)arg = format_bitrate(mpctx->d_audio->bitrate);
return M_PROPERTY_OK;
case M_PROPERTY_GET:
- *(int *)arg = mpctx->d_audio->i_bps;
+ *(int *)arg = mpctx->d_audio->bitrate;
return M_PROPERTY_OK;
}
return M_PROPERTY_NOT_IMPLEMENTED;
@@ -1848,10 +1848,10 @@ static int mp_property_video_bitrate(m_option_t *prop, int action,
if (!mpctx->d_video)
return M_PROPERTY_UNAVAILABLE;
if (action == M_PROPERTY_PRINT) {
- *(char **)arg = format_bitrate(mpctx->d_video->i_bps);
+ *(char **)arg = format_bitrate(mpctx->d_video->bitrate);
return M_PROPERTY_OK;
}
- return m_property_int_ro(prop, action, arg, mpctx->d_video->i_bps);
+ return m_property_int_ro(prop, action, arg, mpctx->d_video->bitrate);
}
static int property_imgparams(struct mp_image_params p, int action, void *arg)