diff options
| author | wm4 <wm4@nowhere> | 2015-06-21 16:56:35 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-06-21 16:56:35 +0200 |
| commit | 2b64eee8d5ed4ab781dcbf98654f028a6d7cef11 (patch) | |
| tree | 64f498f7f15ddf5bd83e7e7b4dca6c1a38cb3cbe /demux/demux_lavf.c | |
| parent | 991af7dfb10c514a10d84f5a3e2698e646eb53d4 (diff) | |
| download | mpv-2b64eee8d5ed4ab781dcbf98654f028a6d7cef11.tar.bz2 mpv-2b64eee8d5ed4ab781dcbf98654f028a6d7cef11.tar.xz | |
demux: rename sh_stream.format to sh_stream.codec_tag
Why not. "format" sounds too misleading for the actual importance and
meaning of this field.
Diffstat (limited to 'demux/demux_lavf.c')
| -rw-r--r-- | demux/demux_lavf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 943fb1d8af..608bf0e03c 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -521,8 +521,6 @@ static void handle_stream(demuxer_t *demuxer, int i) break; sh_audio_t *sh_audio = sh->audio; - sh->format = codec->codec_tag; - // probably unneeded mp_chmap_set_unknown(&sh_audio->channels, codec->channels); if (codec->channel_layout) @@ -550,7 +548,6 @@ static void handle_stream(demuxer_t *demuxer, int i) } } - sh->format = codec->codec_tag; sh_video->disp_w = codec->width; sh_video->disp_h = codec->height; /* Try to make up some frame rate value, even if it's not reliable. @@ -636,6 +633,7 @@ static void handle_stream(demuxer_t *demuxer, int i) if (sh) { sh->ff_index = st->index; sh->codec = mp_codec_from_av_codec_id(codec->codec_id); + sh->codec_tag = codec->codec_tag; sh->lav_headers = codec; if (st->disposition & AV_DISPOSITION_DEFAULT) |