diff options
| author | wm4 <wm4@nowhere> | 2015-02-24 11:56:48 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-25 11:08:15 +0900 |
| commit | 57f5ad445dcb49e1a708d49d242b3fcf0fd6071c (patch) | |
| tree | d362f90f1532dd92d6b179201d914e12fe12f9d5 | |
| parent | a5458a624dbdf039cdae99fb2d8ebb8ffdf13b0b (diff) | |
| download | mpv-57f5ad445dcb49e1a708d49d242b3fcf0fd6071c.tar.bz2 mpv-57f5ad445dcb49e1a708d49d242b3fcf0fd6071c.tar.xz | |
video: remove redundant codec parameters
Remove coded_width and coded_height. This was originally added in commit
fd7dde40, when BITMAPINFOHEADER was killed. The separate fields became
redundant in commit e68f4be1. Remove them (nothing passed to the
decoders actually changes with _this_ commit).
(cherry picked from commit 5baf74fa24493298fc83336da77f400ddac29d55)
| -rw-r--r-- | demux/demux_mkv.c | 2 | ||||
| -rw-r--r-- | demux/stheader.h | 1 | ||||
| -rw-r--r-- | video/decode/vd_lavc.c | 5 |
3 files changed, 0 insertions, 8 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 6747ab2b19..f2cff54ce5 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1283,8 +1283,6 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track) return 1; } - sh_v->coded_width = track->v_width; - sh_v->coded_height = track->v_height; sh_v->extradata = talloc_memdup(sh_v, extradata, extradata_size); sh_v->extradata_len = extradata_size; if (!sh->codec) { diff --git a/demux/stheader.h b/demux/stheader.h index 2b5b43702f..d0f409742f 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -83,7 +83,6 @@ typedef struct sh_video { float aspect; // aspect ratio stored in the file (for prescaling) int bitrate; // compressed bits/sec int bits_per_coded_sample; - int coded_width, coded_height; unsigned char *extradata; int extradata_len; int disp_w, disp_h; // display size diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 1982656f75..9e0a778990 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -402,11 +402,6 @@ static void init_avctx(struct dec_video *vd, const char *decoder, avctx->coded_height = sh->video->disp_h; avctx->bits_per_coded_sample = sh->video->bits_per_coded_sample; - if (sh->video->coded_width && sh->video->coded_height) { - avctx->coded_width = sh->video->coded_width; - avctx->coded_height = sh->video->coded_height; - } - mp_lavc_set_extradata(avctx, sh->video->extradata, sh->video->extradata_len); if (mp_rawvideo) { |