Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
451
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
34db09b8
Commit
34db09b8
authored
18 years ago
by
hartman
Browse files
Options
Downloads
Patches
Plain Diff
* Disable swscale if we don't have it installed
parent
925e40a3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/codec/ffmpeg/scale.c
+29
-4
29 additions, 4 deletions
modules/codec/ffmpeg/scale.c
with
29 additions
and
4 deletions
modules/codec/ffmpeg/scale.c
+
29
−
4
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) */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment