Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
ffmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Samuel Mira
ffmpeg
Commits
f5495c97
Commit
f5495c97
authored
8 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
avutil/avassert: Add av_assertX_fpu()
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
2c1d38d1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
doc/APIchanges
+3
-0
3 additions, 0 deletions
doc/APIchanges
libavutil/avassert.h
+9
-0
9 additions, 0 deletions
libavutil/avassert.h
libavutil/utils.c
+13
-0
13 additions, 0 deletions
libavutil/utils.c
libavutil/version.h
+1
-1
1 addition, 1 deletion
libavutil/version.h
with
26 additions
and
1 deletion
doc/APIchanges
+
3
−
0
View file @
f5495c97
...
...
@@ -15,6 +15,9 @@ libavutil: 2015-08-28
API changes, most recent first:
2016-10-22 - xxxxxxx - lavu 55.33.100 - avassert.h
Add av_assert0_fpu() / av_assert2_fpu()
2016-xx-xx - xxxxxxx - lavc 57.61.100 / lavc 57.24.0 - avcodec.h
Decoders now export the frame timestamp as AVFrame.pts. It was
previously exported as AVFrame.pkt_pts, which is now deprecated.
...
...
This diff is collapsed.
Click to expand it.
libavutil/avassert.h
+
9
−
0
View file @
f5495c97
...
...
@@ -59,8 +59,17 @@
*/
#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1
#define av_assert2(cond) av_assert0(cond)
#define av_assert2_fpu() av_assert0_fpu()
#else
#define av_assert2(cond) ((void)0)
#define av_assert2_fpu() ((void)0)
#endif
/**
* Assert that floating point opperations can be executed.
*
* This will av_assert0() that the cpu is not in MMX state on X86
*/
void
av_assert0_fpu
(
void
);
#endif
/* AVUTIL_AVASSERT_H */
This diff is collapsed.
Click to expand it.
libavutil/utils.c
+
13
−
0
View file @
f5495c97
...
...
@@ -125,3 +125,16 @@ AVRational av_get_time_base_q(void)
{
return
(
AVRational
){
1
,
AV_TIME_BASE
};
}
void
av_assert0_fpu
(
void
)
{
#if HAVE_MMX_INLINE
uint16_t
state
[
14
];
__asm
volatile
(
"fstenv %0
\n\t
"
:
"+m"
(
state
)
:
:
"memory"
);
av_assert0
((
state
[
4
]
&
3
)
==
3
);
#endif
}
This diff is collapsed.
Click to expand it.
libavutil/version.h
+
1
−
1
View file @
f5495c97
...
...
@@ -79,7 +79,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
#define LIBAVUTIL_VERSION_MINOR 3
2
#define LIBAVUTIL_VERSION_MINOR 3
3
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
...
...
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