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
34db09b8
Commit
34db09b8
authored
Nov 17, 2006
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Disable swscale if we don't have it installed
parent
925e40a3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
4 deletions
+29
-4
modules/codec/ffmpeg/scale.c
modules/codec/ffmpeg/scale.c
+29
-4
No files found.
modules/codec/ffmpeg/scale.c
View file @
34db09b8
...
...
@@ -28,12 +28,23 @@
#include <vlc/decoder.h>
#include "vlc_filter.h"
#include <ffmpeg/swscale.h>
#include <ffmpeg/avcodec.h>
#include <ffmpeg/avutil.h>
/* ffmpeg headers */
#ifdef HAVE_FFMPEG_AVCODEC_H
# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
#ifdef HAVE_FFMPEG_SWSCALE_H
# include <ffmpeg/swscale.h>
#else
# include <swscale.h>
#endif
#include "ffmpeg.h"
void
*
(
*
swscale_fast_memcpy
)(
void
*
,
const
void
*
,
size_t
);
/* Version checking */
#if ( LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) ) && (defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE))
/*****************************************************************************
* filter_sys_t : filter descriptor
...
...
@@ -52,6 +63,7 @@ struct filter_sys_t
/****************************************************************************
* Local prototypes
****************************************************************************/
void
*
(
*
swscale_fast_memcpy
)(
void
*
,
const
void
*
,
size_t
);
static
picture_t
*
Filter
(
filter_t
*
,
picture_t
*
);
static
int
CheckInit
(
filter_t
*
);
...
...
@@ -288,3 +300,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
return
p_pic_dst
;
}
#else
/* LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) */
int
E_
(
OpenScaler
)(
vlc_object_t
*
p_this
)
{
return
VLC_EGENERIC
;
}
void
E_
(
CloseScaler
)(
vlc_object_t
*
p_this
)
{
}
#endif
/* LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) */
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