[vlc-commits] avformat mux: use visible width/height for muxing

2015-10-21 Thread Jan Ekström
vlc/vlc-2.2 | branch: master | Jan Ekström  | Thu Jun 25 
01:54:19 2015 +0300| [4a6d40655336027aa0c84adf6ea9540ddaf7e8f6] | committer: 
Jean-Baptiste Kempf

avformat mux: use visible width/height for muxing

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 25987fd3bb07323b8ce6a31626413f8a42b6b479)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4a6d40655336027aa0c84adf6ea9540ddaf7e8f6
---

 modules/demux/avformat/mux.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 2974a6d..9b2d98c 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -248,8 +248,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t 
*p_input )
 
(double)fmt->video.i_frame_rate/(double)fmt->video.i_frame_rate_base );
 
 codec->codec_type = AVMEDIA_TYPE_VIDEO;
-codec->width = fmt->video.i_width;
-codec->height = fmt->video.i_height;
+codec->width = fmt->video.i_visible_width;
+codec->height = fmt->video.i_visible_height;
 av_reduce( >sample_aspect_ratio.num,
>sample_aspect_ratio.den,
fmt->video.i_sar_num,

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] avformat mux: use visible width/height for muxing

2015-06-25 Thread Jan Ekström
vlc | branch: master | Jan Ekström jee...@gmail.com | Thu Jun 25 01:54:19 
2015 +0300| [25987fd3bb07323b8ce6a31626413f8a42b6b479] | committer: 
Jean-Baptiste Kempf

avformat mux: use visible width/height for muxing

Signed-off-by: Jean-Baptiste Kempf j...@videolan.org

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=25987fd3bb07323b8ce6a31626413f8a42b6b479
---

 modules/demux/avformat/mux.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 0dd24cd..2070fb3 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -248,8 +248,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t 
*p_input )
 
(double)fmt-video.i_frame_rate/(double)fmt-video.i_frame_rate_base );
 
 codec-codec_type = AVMEDIA_TYPE_VIDEO;
-codec-width = fmt-video.i_width;
-codec-height = fmt-video.i_height;
+codec-width = fmt-video.i_visible_width;
+codec-height = fmt-video.i_visible_height;
 av_reduce( codec-sample_aspect_ratio.num,
codec-sample_aspect_ratio.den,
fmt-video.i_sar_num,

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits