Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
798e9790
Commit
798e9790
authored
Nov 28, 2002
by
Laurent Aimar
Browse files
* ffmpeg: arg, fix a previous fix for non-latest ffmpeg cvs tree.
parent
474126cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/codec/ffmpeg/video.c
View file @
798e9790
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* video.c: video decoder using ffmpeg library
* video.c: video decoder using ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.
6
2002/11/2
7
1
2
:4
1:4
5 fenrir Exp $
* $Id: video.c,v 1.
7
2002/11/2
8
1
6
:4
4:0
5 fenrir Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
* Gildas Bazin <gbazin@netcourrier.com>
...
@@ -160,17 +160,20 @@ static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec,
...
@@ -160,17 +160,20 @@ static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec,
}
}
#else
#else
switch
(
i_aspect
)
switch
(
p_vdec
->
p_context
->
aspect_ratio_info
)
{
{
case
(
FF_ASPECT_4_3_625
):
case
(
FF_ASPECT_4_3_625
):
case
(
FF_ASPECT_4_3_525
):
case
(
FF_ASPECT_4_3_525
):
i_aspect
=
VOUT_ASPECT_FACTOR
*
4
/
3
;
i_aspect
=
VOUT_ASPECT_FACTOR
*
4
/
3
;
break
;
case
(
FF_ASPECT_16_9_625
):
case
(
FF_ASPECT_16_9_625
):
case
(
FF_ASPECT_16_9_525
):
case
(
FF_ASPECT_16_9_525
):
i_aspect
=
VOUT_ASPECT_FACTOR
*
16
/
9
;
i_aspect
=
VOUT_ASPECT_FACTOR
*
16
/
9
;
break
;
case
(
FF_ASPECT_SQUARE
):
case
(
FF_ASPECT_SQUARE
):
default:
default:
i_aspect
=
VOUT_ASPECT_FACTOR
*
i_width
/
i_height
;
i_aspect
=
VOUT_ASPECT_FACTOR
*
i_width
/
i_height
;
break
;
}
}
#endif
#endif
/* Spawn a video output if there is none. First we look for our children,
/* Spawn a video output if there is none. First we look for our children,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment