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
8ede3d79
Commit
8ede3d79
authored
Mar 07, 2008
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile fix for packaged ffmpeg on debian etch.
Signed-off-by:
Rémi Duraffort
<
ivoire@via.ecp.fr
>
parent
5568a82a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
modules/codec/ffmpeg/ffmpeg.c
modules/codec/ffmpeg/ffmpeg.c
+2
-0
modules/codec/ffmpeg/video.c
modules/codec/ffmpeg/video.c
+8
-0
No files found.
modules/codec/ffmpeg/ffmpeg.c
View file @
8ede3d79
...
...
@@ -498,7 +498,9 @@ static struct
{
VLC_FOURCC
(
'R'
,
'V'
,
'1'
,
'6'
),
PIX_FMT_BGR565
},
{
VLC_FOURCC
(
'R'
,
'V'
,
'2'
,
'4'
),
PIX_FMT_BGR24
},
#else
#if defined(PIX_FMT_RGB8)
{
VLC_FOURCC
(
'R'
,
'G'
,
'B'
,
'8'
),
PIX_FMT_RGB8
},
#endif
{
VLC_FOURCC
(
'R'
,
'V'
,
'1'
,
'5'
),
PIX_FMT_RGB555
},
{
VLC_FOURCC
(
'R'
,
'V'
,
'1'
,
'6'
),
PIX_FMT_RGB565
},
{
VLC_FOURCC
(
'R'
,
'V'
,
'2'
,
'4'
),
PIX_FMT_RGB24
},
...
...
modules/codec/ffmpeg/video.c
View file @
8ede3d79
...
...
@@ -134,8 +134,10 @@ static uint32_t ffmpeg_PixFmtToChroma( int i_ff_chroma )
case
PIX_FMT_BGR24
:
return
VLC_FOURCC
(
'R'
,
'V'
,
'2'
,
'4'
);
#else
#if defined(PIX_FMT_RGB8)
case
PIX_FMT_RGB8
:
return
VLC_FOURCC
(
'R'
,
'G'
,
'B'
,
'8'
);
#endif
case
PIX_FMT_RGB555
:
return
VLC_FOURCC
(
'R'
,
'V'
,
'1'
,
'5'
);
case
PIX_FMT_RGB565
:
...
...
@@ -852,10 +854,16 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
case
PIX_FMT_YUV411P
:
case
PIX_FMT_RGB32
:
case
PIX_FMT_RGB24
:
#if defined(PIX_FMT_RGB8)
case
PIX_FMT_RGB8
:
#endif
#if defined(PIX_FMT_BRG32)
case
PIX_FMT_BGR32
:
#endif
case
PIX_FMT_BGR24
:
#if defined(PIX_FMT_BGR8)
case
PIX_FMT_BGR8
:
#endif
case
PIX_FMT_PAL8
:
for
(
i
=
0
;
i
<
p_pic
->
i_planes
;
i
++
)
{
...
...
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