Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
88bf1689
Commit
88bf1689
authored
Mar 10, 2015
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavd/avfoundation: Silence warnings when compiling for iOS.
Reviewed-by: Thilo Borgmann
parent
87b3c6e2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
avfoundation.m
libavdevice/avfoundation.m
+5
-5
No files found.
libavdevice/avfoundation.m
View file @
88bf1689
...
...
@@ -71,7 +71,7 @@ static const struct AVFPixelFormatSpec avf_pixel_formats[] = {
{
AV_PIX_FMT_YUV420P
,
kCVPixelFormatType_420YpCbCr8Planar
},
{
AV_PIX_FMT_NV12
,
kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
},
{
AV_PIX_FMT_YUYV422
,
kCVPixelFormatType_422YpCbCr8_yuvs
},
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
#if
!TARGET_OS_IPHONE &&
__MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
{
AV_PIX_FMT_GRAY8
,
kCVPixelFormatType_OneComponent8
},
#endif
{
AV_PIX_FMT_NONE
,
0
}
...
...
@@ -563,7 +563,7 @@ static int avf_read_header(AVFormatContext *s)
pthread_mutex_init
(
&
ctx
->
frame_lock
,
NULL
);
pthread_cond_init
(
&
ctx
->
frame_wait_cond
,
NULL
);
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
#if
!TARGET_OS_IPHONE &&
__MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
CGGetActiveDisplayList
(
0
,
NULL
,
&
num_screens
);
#endif
...
...
@@ -577,7 +577,7 @@ static int avf_read_header(AVFormatContext *s)
av_log
(
ctx
,
AV_LOG_INFO
,
"[%d] %s
\n
"
,
index
,
name
);
index
++
;
}
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
#if
!TARGET_OS_IPHONE &&
__MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
if
(
num_screens
>
0
)
{
CGDirectDisplayID
screens
[
num_screens
];
CGGetActiveDisplayList
(
num_screens
,
screens
,
&
num_screens
);
...
...
@@ -612,7 +612,7 @@ static int avf_read_header(AVFormatContext *s)
if
(
ctx
->
video_device_index
<
ctx
->
num_video_devices
)
{
video_device
=
[
devices
objectAtIndex
:
ctx
->
video_device_index
];
}
else
if
(
ctx
->
video_device_index
<
ctx
->
num_video_devices
+
num_screens
)
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
#if
!TARGET_OS_IPHONE &&
__MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
CGDirectDisplayID
screens
[
num_screens
];
CGGetActiveDisplayList
(
num_screens
,
screens
,
&
num_screens
);
AVCaptureScreenInput
*
capture_screen_input
=
[[[
AVCaptureScreenInput
alloc
]
initWithDisplayID
:
screens
[
ctx
->
video_device_index
-
ctx
->
num_video_devices
]]
autorelease
];
...
...
@@ -635,7 +635,7 @@ static int avf_read_header(AVFormatContext *s)
}
}
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
#if
!TARGET_OS_IPHONE &&
__MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
// looking for screen inputs
if
(
!
video_device
)
{
int
idx
;
...
...
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