Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
35824733
Commit
35824733
authored
Aug 01, 2008
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'df-for-upstream' of
git://repo.or.cz/vlc/davidf-public
parents
ec6ed81c
7ca75b8a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
modules/codec/schroedinger.c
modules/codec/schroedinger.c
+5
-0
modules/demux/ogg.c
modules/demux/ogg.c
+1
-0
No files found.
modules/codec/schroedinger.c
View file @
35824733
...
...
@@ -488,6 +488,11 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
#endif
SetVideoFormat
(
p_dec
);
ResetPTStlb
(
p_dec
);
p_schroframe
=
CreateSchroFrameFromPic
(
p_dec
);
if
(
p_schroframe
)
{
schro_decoder_add_output_picture
(
p_sys
->
p_schro
,
p_schroframe
);
}
}
if
(
b_bail
)
...
...
modules/demux/ogg.c
View file @
35824733
...
...
@@ -1628,6 +1628,7 @@ static void Ogg_ReadDiracHeader( logical_stream_t *p_stream,
static
const
struct
{
uint32_t
u_n
/* numerator */
,
u_d
/* denominator */
;
}
dirac_frate_tbl
[]
=
{
/* table 10.3 */
{
1
,
1
},
/* this first value is never used */
{
24000
,
1001
},
{
24
,
1
},
{
25
,
1
},
{
30000
,
1001
},
{
30
,
1
},
{
50
,
1
},
{
60000
,
1001
},
{
60
,
1
},
{
15000
,
1001
},
{
25
,
2
},
};
...
...
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