Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
242c73a0
Commit
242c73a0
authored
Oct 17, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: use avpriv_ prefix for some dv symbols used in lavf.
Specifically, ff_dv_frame_profile and ff_dv_codec_profile.
parent
d9cca9fc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
dv.c
libavcodec/dv.c
+3
-3
dvdata.c
libavcodec/dvdata.c
+2
-2
dvdata.h
libavcodec/dvdata.h
+3
-3
dv.c
libavformat/dv.c
+3
-3
dvenc.c
libavformat/dvenc.c
+1
-1
No files found.
libavcodec/dv.c
View file @
242c73a0
...
...
@@ -349,7 +349,7 @@ static av_cold int dvvideo_init(AVCodecContext *avctx)
static
av_cold
int
dvvideo_init_encoder
(
AVCodecContext
*
avctx
)
{
if
(
!
ff
_dv_codec_profile
(
avctx
))
{
if
(
!
avpriv
_dv_codec_profile
(
avctx
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Found no DV profile for %ix%i %s video
\n
"
,
avctx
->
width
,
avctx
->
height
,
av_get_pix_fmt_name
(
avctx
->
pix_fmt
));
return
-
1
;
...
...
@@ -1072,7 +1072,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
const
uint8_t
*
vsc_pack
;
int
apt
,
is16_9
;
s
->
sys
=
ff
_dv_frame_profile
(
s
->
sys
,
buf
,
buf_size
);
s
->
sys
=
avpriv
_dv_frame_profile
(
s
->
sys
,
buf
,
buf_size
);
if
(
!
s
->
sys
||
buf_size
<
s
->
sys
->
frame_size
||
dv_init_dynamic_tables
(
s
->
sys
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"could not find dv frame profile
\n
"
);
return
-
1
;
/* NOTE: we only accept several full frames */
...
...
@@ -1245,7 +1245,7 @@ static int dvvideo_encode_frame(AVCodecContext *c, uint8_t *buf, int buf_size,
{
DVVideoContext
*
s
=
c
->
priv_data
;
s
->
sys
=
ff
_dv_codec_profile
(
c
);
s
->
sys
=
avpriv
_dv_codec_profile
(
c
);
if
(
!
s
->
sys
||
buf_size
<
s
->
sys
->
frame_size
||
dv_init_dynamic_tables
(
s
->
sys
))
return
-
1
;
...
...
libavcodec/dvdata.c
View file @
242c73a0
...
...
@@ -245,7 +245,7 @@ static const DVprofile dv_profiles[] = {
}
};
const
DVprofile
*
ff
_dv_frame_profile
(
const
DVprofile
*
sys
,
const
DVprofile
*
avpriv
_dv_frame_profile
(
const
DVprofile
*
sys
,
const
uint8_t
*
frame
,
unsigned
buf_size
)
{
int
i
;
...
...
@@ -270,7 +270,7 @@ const DVprofile* ff_dv_frame_profile(const DVprofile *sys,
return
NULL
;
}
const
DVprofile
*
ff
_dv_codec_profile
(
AVCodecContext
*
codec
)
const
DVprofile
*
avpriv
_dv_codec_profile
(
AVCodecContext
*
codec
)
{
int
i
;
...
...
libavcodec/dvdata.h
View file @
242c73a0
...
...
@@ -274,9 +274,9 @@ enum dv_pack_type {
*/
#define DV_MAX_BPM 8
const
DVprofile
*
ff
_dv_frame_profile
(
const
DVprofile
*
sys
,
const
uint8_t
*
frame
,
unsigned
buf_size
);
const
DVprofile
*
ff
_dv_codec_profile
(
AVCodecContext
*
codec
);
const
DVprofile
*
avpriv
_dv_frame_profile
(
const
DVprofile
*
sys
,
const
uint8_t
*
frame
,
unsigned
buf_size
);
const
DVprofile
*
avpriv
_dv_codec_profile
(
AVCodecContext
*
codec
);
static
inline
int
dv_write_dif_id
(
enum
dv_section_type
t
,
uint8_t
chan_num
,
uint8_t
seq_num
,
uint8_t
dif_num
,
...
...
libavformat/dv.c
View file @
242c73a0
...
...
@@ -323,7 +323,7 @@ int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,
uint8_t
*
ppcm
[
4
]
=
{
0
};
if
(
buf_size
<
DV_PROFILE_BYTES
||
!
(
c
->
sys
=
ff
_dv_frame_profile
(
c
->
sys
,
buf
,
buf_size
))
||
!
(
c
->
sys
=
avpriv
_dv_frame_profile
(
c
->
sys
,
buf
,
buf_size
))
||
buf_size
<
c
->
sys
->
frame_size
)
{
return
-
1
;
/* Broken frame, or not enough data */
}
...
...
@@ -369,7 +369,7 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c,
int64_t
timestamp
,
int
flags
)
{
// FIXME: sys may be wrong if last dv_read_packet() failed (buffer is junk)
const
DVprofile
*
sys
=
ff
_dv_codec_profile
(
c
->
vst
->
codec
);
const
DVprofile
*
sys
=
avpriv
_dv_codec_profile
(
c
->
vst
->
codec
);
int64_t
offset
;
int64_t
size
=
avio_size
(
s
->
pb
)
-
s
->
data_offset
;
int64_t
max_offset
=
((
size
-
1
)
/
sys
->
frame_size
)
*
sys
->
frame_size
;
...
...
@@ -432,7 +432,7 @@ static int dv_read_header(AVFormatContext *s,
avio_seek
(
s
->
pb
,
-
DV_PROFILE_BYTES
,
SEEK_CUR
)
<
0
)
return
AVERROR
(
EIO
);
c
->
dv_demux
->
sys
=
ff
_dv_frame_profile
(
c
->
dv_demux
->
sys
,
c
->
buf
,
DV_PROFILE_BYTES
);
c
->
dv_demux
->
sys
=
avpriv
_dv_frame_profile
(
c
->
dv_demux
->
sys
,
c
->
buf
,
DV_PROFILE_BYTES
);
if
(
!
c
->
dv_demux
->
sys
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Can't determine profile of DV input stream.
\n
"
);
return
-
1
;
...
...
libavformat/dvenc.c
View file @
242c73a0
...
...
@@ -325,7 +325,7 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
c
->
ast
[
i
]
->
codec
->
channels
!=
2
))
goto
bail_out
;
}
c
->
sys
=
ff
_dv_codec_profile
(
vst
->
codec
);
c
->
sys
=
avpriv
_dv_codec_profile
(
vst
->
codec
);
if
(
!
c
->
sys
)
goto
bail_out
;
...
...
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