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
71bf6b41
Commit
71bf6b41
authored
Aug 06, 2013
by
Rémi Denis-Courmont
Committed by
Anton Khirnov
Aug 07, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libavdevice: use avpriv_open()
Signed-off-by:
Anton Khirnov
<
anton@khirnov.net
>
parent
fee9db1f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
6 deletions
+10
-6
bktr.c
libavdevice/bktr.c
+2
-1
dv1394.c
libavdevice/dv1394.c
+2
-1
fbdev.c
libavdevice/fbdev.c
+2
-1
oss_audio.c
libavdevice/oss_audio.c
+3
-2
v4l2.c
libavdevice/v4l2.c
+1
-1
No files found.
libavdevice/bktr.c
View file @
71bf6b41
...
...
@@ -26,6 +26,7 @@
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
...
...
@@ -136,7 +137,7 @@ static av_cold int bktr_init(const char *video_device, int width, int height,
act
.
sa_handler
=
catchsignal
;
sigaction
(
SIGUSR1
,
&
act
,
&
old
);
*
tuner_fd
=
open
(
"/dev/tuner0"
,
O_RDONLY
);
*
tuner_fd
=
avpriv_
open
(
"/dev/tuner0"
,
O_RDONLY
);
if
(
*
tuner_fd
<
0
)
av_log
(
NULL
,
AV_LOG_ERROR
,
"Warning. Tuner not opened, continuing: %s
\n
"
,
strerror
(
errno
));
...
...
libavdevice/dv1394.c
View file @
71bf6b41
...
...
@@ -27,6 +27,7 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavformat/avformat.h"
...
...
@@ -88,7 +89,7 @@ static int dv1394_read_header(AVFormatContext * context)
goto
failed
;
/* Open and initialize DV1394 device */
dv
->
fd
=
open
(
context
->
filename
,
O_RDONLY
);
dv
->
fd
=
avpriv_
open
(
context
->
filename
,
O_RDONLY
);
if
(
dv
->
fd
<
0
)
{
av_log
(
context
,
AV_LOG_ERROR
,
"Failed to open DV interface: %s
\n
"
,
strerror
(
errno
));
goto
failed
;
...
...
libavdevice/fbdev.c
View file @
71bf6b41
...
...
@@ -34,6 +34,7 @@
#include <time.h>
#include <linux/fb.h>
#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
...
...
@@ -114,7 +115,7 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx)
if
(
avctx
->
flags
&
AVFMT_FLAG_NONBLOCK
)
flags
|=
O_NONBLOCK
;
if
((
fbdev
->
fd
=
open
(
avctx
->
filename
,
flags
))
==
-
1
)
{
if
((
fbdev
->
fd
=
avpriv_
open
(
avctx
->
filename
,
flags
))
==
-
1
)
{
ret
=
AVERROR
(
errno
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"Could not open framebuffer device '%s': %s
\n
"
,
...
...
libavdevice/oss_audio.c
View file @
71bf6b41
...
...
@@ -34,6 +34,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/time.h"
...
...
@@ -63,9 +64,9 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi
char
*
flip
=
getenv
(
"AUDIO_FLIP_LEFT"
);
if
(
is_output
)
audio_fd
=
open
(
audio_device
,
O_WRONLY
);
audio_fd
=
avpriv_
open
(
audio_device
,
O_WRONLY
);
else
audio_fd
=
open
(
audio_device
,
O_RDONLY
);
audio_fd
=
avpriv_
open
(
audio_device
,
O_RDONLY
);
if
(
audio_fd
<
0
)
{
av_log
(
s1
,
AV_LOG_ERROR
,
"%s: %s
\n
"
,
audio_device
,
strerror
(
errno
));
return
AVERROR
(
EIO
);
...
...
libavdevice/v4l2.c
View file @
71bf6b41
...
...
@@ -124,7 +124,7 @@ static int device_open(AVFormatContext *ctx)
flags
|=
O_NONBLOCK
;
}
fd
=
open
(
ctx
->
filename
,
flags
,
0
);
fd
=
avpriv_open
(
ctx
->
filename
,
flags
);
if
(
fd
<
0
)
{
err
=
errno
;
...
...
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