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 /demux | |
| 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 'demux')
| -rw-r--r-- | demux/demux_lavf.c | 4 | ||||
| -rw-r--r-- | demux/demux_raw.c | 2 | ||||
| -rw-r--r-- | demux/stheader.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 75e6cb41f0..9559c73260 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -433,7 +433,7 @@ static void handle_stream(demuxer_t *demuxer, int i) if (codec->channel_layout) mp_chmap_from_lavc(&sh_audio->channels, codec->channel_layout); sh_audio->samplerate = codec->sample_rate; - sh_audio->i_bps = codec->bit_rate; + sh_audio->bitrate = codec->bit_rate; export_replaygain(demuxer, st); @@ -477,7 +477,7 @@ static void handle_stream(demuxer_t *demuxer, int i) else sh_video->aspect = codec->width * codec->sample_aspect_ratio.num / (float)(codec->height * codec->sample_aspect_ratio.den); - sh_video->i_bps = codec->bit_rate; + sh_video->bitrate = codec->bit_rate; AVDictionaryEntry *rot = av_dict_get(st->metadata, "rotate", NULL, 0); if (rot && rot->value) { diff --git a/demux/demux_raw.c b/demux/demux_raw.c index ceb5d7bf30..c2579ab536 100644 --- a/demux/demux_raw.c +++ b/demux/demux_raw.c @@ -179,7 +179,7 @@ static int demux_rawvideo_open(demuxer_t *demuxer, enum demux_check check) sh_video->fps = fps; sh_video->disp_w = width; sh_video->disp_h = height; - sh_video->i_bps = fps * imgsize * 8; + sh_video->bitrate = fps * imgsize * 8; struct priv *p = talloc_ptrtype(demuxer, p); demuxer->priv = p; diff --git a/demux/stheader.h b/demux/stheader.h index c8a72795b0..101c75e880 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -67,7 +67,7 @@ struct sh_stream { typedef struct sh_audio { int samplerate; struct mp_chmap channels; - int i_bps; // == bitrate (compressed bits/sec) + int bitrate; // compressed bits/sec // win32-compatible codec parameters: MP_WAVEFORMATEX *wf; // note codec extradata may be either under "wf" or "codecdata" @@ -79,7 +79,7 @@ typedef struct sh_video { bool avi_dts; // use DTS timing; first frame and DTS is 0 float fps; // frames per second (set only if constant fps) float aspect; // aspect ratio stored in the file (for prescaling) - int i_bps; // == bitrate (compressed bits/sec) + int bitrate; // compressed bits/sec int disp_w, disp_h; // display size int rotate; // intended display rotation, in degrees, [0, 359] MP_BITMAPINFOHEADER *bih; |