Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
4101032f
Commit
4101032f
authored
Jun 28, 2003
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ffmpeg : do no try to automatically set ffmpeg-truncated (it's broken
with .mp4 files)
parent
57937813
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
modules/codec/ffmpeg/video.c
modules/codec/ffmpeg/video.c
+8
-4
No files found.
modules/codec/ffmpeg/video.c
View file @
4101032f
...
@@ -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.3
2 2003/06/19 21:09:27 gbazin
Exp $
* $Id: video.c,v 1.3
3 2003/06/28 21:16:57 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>
...
@@ -126,7 +126,7 @@ static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec,
...
@@ -126,7 +126,7 @@ static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec,
/* 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,
* then we look for any other vout that might be available. */
* then we look for any other vout that might be available. */
p_vout
=
vout_Request
(
p_vdec
->
p_fifo
,
NULL
,
p_vout
=
vout_Request
(
p_vdec
->
p_fifo
,
p_vdec
->
p_vout
,
i_width
,
i_height
,
i_chroma
,
i_aspect
);
i_width
,
i_height
,
i_chroma
,
i_aspect
);
#ifdef LIBAVCODEC_PP
#ifdef LIBAVCODEC_PP
if
(
p_vdec
->
pp_mode
&&
!
p_vdec
->
pp_context
)
if
(
p_vdec
->
pp_mode
&&
!
p_vdec
->
pp_context
)
...
@@ -239,8 +239,11 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
...
@@ -239,8 +239,11 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
/* FIXME search real LIBAVCODEC_BUILD */
/* FIXME search real LIBAVCODEC_BUILD */
#if LIBAVCODEC_BUILD >= 4662
#if LIBAVCODEC_BUILD >= 4662
i_truncated
=
config_GetInt
(
p_vdec
->
p_fifo
,
"ffmpeg-truncated"
);
i_truncated
=
config_GetInt
(
p_vdec
->
p_fifo
,
"ffmpeg-truncated"
);
if
(
i_truncated
==
1
||
(
i_truncated
==
-
1
&&
if
(
i_truncated
==
1
)
(
p_vdec
->
p_context
->
width
==
0
||
p_vdec
->
p_context
->
height
==
0
)
)
)
#if 0
||
( i_truncated == -1 && ( p_vdec->p_context->width == 0 || p_vdec->p_context->height == 0 ) ) )
#endif
{
{
p_vdec
->
p_context
->
flags
|=
CODEC_FLAG_TRUNCATED
;
p_vdec
->
p_context
->
flags
|=
CODEC_FLAG_TRUNCATED
;
}
}
...
@@ -364,6 +367,7 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
...
@@ -364,6 +367,7 @@ int E_( InitThread_Video )( vdec_thread_t *p_vdec )
i_size
);
i_size
);
}
}
}
}
p_vdec
->
p_vout
=
NULL
;
return
(
VLC_SUCCESS
);
return
(
VLC_SUCCESS
);
}
}
...
...
Write
Preview
Markdown
is supported
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