diff options
| author | Marcoen Hirschberg <m.hirschberg@activevideo.com> | 2014-05-27 00:15:41 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-05-28 21:37:50 +0200 |
| commit | 434242adb5dc045faf16f8bb19aa740732cc3345 (patch) | |
| tree | af5d64f31973a33b70ba23e17cd8e59ee9134702 /video | |
| parent | 6e58b20cced05c303f1b35d5baa5f79b8ad612f5 (diff) | |
| download | mpv-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 'video')
| -rw-r--r-- | video/decode/dec_video.c | 4 | ||||
| -rw-r--r-- | video/decode/dec_video.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index 57307b7399..eb312edf4f 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -388,8 +388,8 @@ int video_reconfig_filters(struct dec_video *d_video, struct sh_video *sh = d_video->header->video; MP_VERBOSE(d_video, "VIDEO: %dx%d %5.3f fps %5.1f kbps (%4.1f kB/s)\n", - p.w, p.h, sh->fps, sh->i_bps / 1000.0, - sh->i_bps / 8000.0); + p.w, p.h, sh->fps, sh->bitrate / 1000.0, + sh->bitrate / 8000.0); MP_VERBOSE(d_video, "VDec: vo config request - %d x %d (%s)\n", p.w, p.h, vo_format_name(p.imgfmt)); diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index e0f07e0531..9541cb3ca6 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -73,7 +73,7 @@ struct dec_video { double decoded_pts; float stream_aspect; // aspect ratio in media headers (DVD IFO files) - int i_bps; // == bitrate (compressed bits/sec) + int bitrate; // compressed bits/sec float fps; // FPS from demuxer or from user override float initial_decoder_aspect; |