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
2d037953
Commit
2d037953
authored
Nov 23, 2003
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* all: do not use p_fifo.
parent
53d9b1b2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
modules/codec/ffmpeg/video.c
modules/codec/ffmpeg/video.c
+2
-2
modules/codec/subsdec.c
modules/codec/subsdec.c
+2
-2
modules/codec/tarkin.c
modules/codec/tarkin.c
+3
-4
No files found.
modules/codec/ffmpeg/video.c
View file @
2d037953
...
...
@@ -2,7 +2,7 @@
* video.c: video decoder using the ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.4
8 2003/11/22 23:39:14
fenrir Exp $
* $Id: video.c,v 1.4
9 2003/11/23 03:55:01
fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -602,7 +602,7 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
default:
msg_Err
(
p_dec
,
"don't know how to convert chroma %i"
,
p_sys
->
p_context
->
pix_fmt
);
p_dec
->
p_fifo
->
b_error
=
1
;
p_dec
->
b_error
=
1
;
break
;
}
}
...
...
modules/codec/subsdec.c
View file @
2d037953
...
...
@@ -2,7 +2,7 @@
* subsdec.c : text subtitles decoder
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: subsdec.c,v 1.1
1 2003/11/22 23:39:14
fenrir Exp $
* $Id: subsdec.c,v 1.1
2 2003/11/23 03:55:01
fenrir Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Samuel Hocevar <sam@zoy.org>
...
...
@@ -310,7 +310,7 @@ static void ParseText( decoder_t *p_dec, block_t *p_block,
}
#endif
if
(
p_dec
->
p_fifo
->
i_fourc
c
==
VLC_FOURCC
(
's'
,
's'
,
'a'
,
' '
)
)
if
(
p_dec
->
fmt_in
.
i_code
c
==
VLC_FOURCC
(
's'
,
's'
,
'a'
,
' '
)
)
{
/* Decode SSA strings */
/* We expect: ReadOrder, Layer, Style, Name, MarginL, MarginR, MarginV, Effect, Text */
...
...
modules/codec/tarkin.c
View file @
2d037953
...
...
@@ -2,7 +2,7 @@
* tarkin.c: tarkin decoder module making use of libtarkin.
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: tarkin.c,v 1.
9 2003/11/22 23:39:14
fenrir Exp $
* $Id: tarkin.c,v 1.
10 2003/11/23 03:55:01
fenrir Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
...
...
@@ -188,7 +188,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if
(
tarkin_synthesis_headerin
(
&
p_sys
->
ti
,
&
p_sys
->
tc
,
&
oggpacket
)
<
0
)
{
msg_Err
(
p_dec
->
p_fifo
,
"3rd Tarkin header is corrupted"
);
msg_Err
(
p_dec
,
"3rd Tarkin header is corrupted"
);
block_Release
(
p_block
);
return
NULL
;
}
...
...
@@ -308,8 +308,7 @@ static void tarkin_CopyPicture( decoder_t *p_dec, picture_t *p_pic,
for
(
i_line
=
0
;
i_line
<
p_pic
->
p
[
i_plane
].
i_lines
;
i_line
++
)
{
p_dec
->
p_fifo
->
p_vlc
->
pf_memcpy
(
p_dst
,
p_src
,
i_src_stride
);
p_dec
->
p_vlc
->
pf_memcpy
(
p_dst
,
p_src
,
i_src_stride
);
p_src
+=
i_src_stride
;
p_dst
+=
i_dst_stride
;
...
...
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