Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
6da5c9b0
Commit
6da5c9b0
authored
Jul 24, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: add assertion after vlc_va_Get() + cosmetics
parent
e918aa68
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+7
-3
No files found.
modules/codec/avcodec/video.c
View file @
6da5c9b0
...
...
@@ -909,7 +909,8 @@ static void lavc_va_ReleaseFrame(void *opaque, uint8_t *data)
(
void
)
data
;
}
static
int
lavc_va_GetFrame
(
struct
AVCodecContext
*
ctx
,
AVFrame
*
frame
)
static
int
lavc_va_GetFrame
(
struct
AVCodecContext
*
ctx
,
AVFrame
*
frame
,
int
flags
)
{
decoder_t
*
dec
=
ctx
->
opaque
;
decoder_sys_t
*
sys
=
dec
->
p_sys
;
...
...
@@ -943,6 +944,9 @@ static int lavc_va_GetFrame(struct AVCodecContext *ctx, AVFrame *frame)
lavc_va_ReleaseFrame
(
ref
,
frame
->
data
[
0
]);
return
-
1
;
}
assert
(
frame
->
data
[
0
]
!=
NULL
);
assert
(
frame
->
data
[
3
]
!=
NULL
);
(
void
)
flags
;
return
0
;
}
...
...
@@ -962,7 +966,7 @@ static void lavc_dr_ReleaseFrame(void *opaque, uint8_t *data)
}
static
picture_t
*
lavc_dr_GetFrame
(
struct
AVCodecContext
*
ctx
,
AVFrame
*
frame
,
unsigned
flags
)
AVFrame
*
frame
,
int
flags
)
{
decoder_t
*
dec
=
(
decoder_t
*
)
ctx
->
opaque
;
...
...
@@ -1047,7 +1051,7 @@ static int lavc_GetFrame(struct AVCodecContext *ctx, AVFrame *frame, int flags)
}
if
(
sys
->
p_va
!=
NULL
)
return
lavc_va_GetFrame
(
ctx
,
frame
);
return
lavc_va_GetFrame
(
ctx
,
frame
,
flags
);
frame
->
opaque
=
NULL
;
if
(
!
sys
->
b_direct_rendering
)
...
...
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