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
7099f365
Commit
7099f365
authored
Jan 02, 2012
by
Paul B Mahol
Committed by
Michael Niedermayer
Jan 03, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: replace rest of deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
12bdc7b1
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
11 additions
and
11 deletions
+11
-11
bintext.c
libavcodec/bintext.c
+1
-1
flashsv2enc.c
libavcodec/flashsv2enc.c
+2
-2
j2kdec.c
libavcodec/j2kdec.c
+1
-1
msvideo1enc.c
libavcodec/msvideo1enc.c
+1
-1
proresdec2.c
libavcodec/proresdec2.c
+1
-1
v410dec.c
libavcodec/v410dec.c
+1
-1
v410enc.c
libavcodec/v410enc.c
+1
-1
vble.c
libavcodec/vble.c
+1
-1
y41pdec.c
libavcodec/y41pdec.c
+1
-1
y41penc.c
libavcodec/y41penc.c
+1
-1
No files found.
libavcodec/bintext.c
View file @
7099f365
...
@@ -139,7 +139,7 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -139,7 +139,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
-
1
;
return
-
1
;
}
}
s
->
frame
.
pict_type
=
FF_I_TYPE
;
s
->
frame
.
pict_type
=
AV_PICTURE_TYPE_I
;
s
->
frame
.
palette_has_changed
=
1
;
s
->
frame
.
palette_has_changed
=
1
;
memcpy
(
s
->
frame
.
data
[
1
],
s
->
palette
,
16
*
4
);
memcpy
(
s
->
frame
.
data
[
1
],
s
->
palette
,
16
*
4
);
...
...
libavcodec/flashsv2enc.c
View file @
7099f365
...
@@ -870,12 +870,12 @@ static int flashsv2_encode_frame(AVCodecContext * avctx, uint8_t * buf,
...
@@ -870,12 +870,12 @@ static int flashsv2_encode_frame(AVCodecContext * avctx, uint8_t * buf,
if
(
keyframe
)
{
if
(
keyframe
)
{
new_key_frame
(
s
);
new_key_frame
(
s
);
p
->
pict_type
=
FF_I_TYPE
;
p
->
pict_type
=
AV_PICTURE_TYPE_I
;
p
->
key_frame
=
1
;
p
->
key_frame
=
1
;
s
->
last_key_frame
=
avctx
->
frame_number
;
s
->
last_key_frame
=
avctx
->
frame_number
;
av_log
(
avctx
,
AV_LOG_DEBUG
,
"Inserting key frame at frame %d
\n
"
,
avctx
->
frame_number
);
av_log
(
avctx
,
AV_LOG_DEBUG
,
"Inserting key frame at frame %d
\n
"
,
avctx
->
frame_number
);
}
else
{
}
else
{
p
->
pict_type
=
FF_P_TYPE
;
p
->
pict_type
=
AV_PICTURE_TYPE_P
;
p
->
key_frame
=
0
;
p
->
key_frame
=
0
;
}
}
...
...
libavcodec/j2kdec.c
View file @
7099f365
...
@@ -274,7 +274,7 @@ static int get_siz(J2kDecoderContext *s)
...
@@ -274,7 +274,7 @@ static int get_siz(J2kDecoderContext *s)
if
((
ret
=
s
->
avctx
->
get_buffer
(
s
->
avctx
,
&
s
->
picture
))
<
0
)
if
((
ret
=
s
->
avctx
->
get_buffer
(
s
->
avctx
,
&
s
->
picture
))
<
0
)
return
ret
;
return
ret
;
s
->
picture
.
pict_type
=
FF_I_TYPE
;
s
->
picture
.
pict_type
=
AV_PICTURE_TYPE_I
;
s
->
picture
.
key_frame
=
1
;
s
->
picture
.
key_frame
=
1
;
return
0
;
return
0
;
...
...
libavcodec/msvideo1enc.c
View file @
7099f365
...
@@ -243,7 +243,7 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void
...
@@ -243,7 +243,7 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void
c
->
keyint
=
0
;
c
->
keyint
=
0
;
else
else
c
->
keyint
++
;
c
->
keyint
++
;
p
->
pict_type
=
keyframe
?
FF_I_TYPE
:
FF_P_TYPE
;
p
->
pict_type
=
keyframe
?
AV_PICTURE_TYPE_I
:
AV_PICTURE_TYPE_P
;
p
->
key_frame
=
keyframe
;
p
->
key_frame
=
keyframe
;
return
dst
-
buf
;
return
dst
-
buf
;
...
...
libavcodec/proresdec2.c
View file @
7099f365
...
@@ -73,7 +73,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
...
@@ -73,7 +73,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
ff_proresdsp_init
(
&
ctx
->
prodsp
,
avctx
);
ff_proresdsp_init
(
&
ctx
->
prodsp
,
avctx
);
avctx
->
coded_frame
=
&
ctx
->
frame
;
avctx
->
coded_frame
=
&
ctx
->
frame
;
ctx
->
frame
.
type
=
FF_I_TYPE
;
ctx
->
frame
.
type
=
AV_PICTURE_TYPE_I
;
ctx
->
frame
.
key_frame
=
1
;
ctx
->
frame
.
key_frame
=
1
;
ff_init_scantable_permutation
(
idct_permutation
,
ff_init_scantable_permutation
(
idct_permutation
,
...
...
libavcodec/v410dec.c
View file @
7099f365
...
@@ -67,7 +67,7 @@ static int v410_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -67,7 +67,7 @@ static int v410_decode_frame(AVCodecContext *avctx, void *data,
}
}
pic
->
key_frame
=
1
;
pic
->
key_frame
=
1
;
pic
->
pict_type
=
FF_I_TYPE
;
pic
->
pict_type
=
AV_PICTURE_TYPE_I
;
y
=
(
uint16_t
*
)
pic
->
data
[
0
];
y
=
(
uint16_t
*
)
pic
->
data
[
0
];
u
=
(
uint16_t
*
)
pic
->
data
[
1
];
u
=
(
uint16_t
*
)
pic
->
data
[
1
];
...
...
libavcodec/v410enc.c
View file @
7099f365
...
@@ -57,7 +57,7 @@ static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf,
...
@@ -57,7 +57,7 @@ static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf,
avctx
->
coded_frame
->
reference
=
0
;
avctx
->
coded_frame
->
reference
=
0
;
avctx
->
coded_frame
->
key_frame
=
1
;
avctx
->
coded_frame
->
key_frame
=
1
;
avctx
->
coded_frame
->
pict_type
=
FF_I_TYPE
;
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_I
;
y
=
(
uint16_t
*
)
pic
->
data
[
0
];
y
=
(
uint16_t
*
)
pic
->
data
[
0
];
u
=
(
uint16_t
*
)
pic
->
data
[
1
];
u
=
(
uint16_t
*
)
pic
->
data
[
1
];
...
...
libavcodec/vble.c
View file @
7099f365
...
@@ -134,7 +134,7 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
...
@@ -134,7 +134,7 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
/* Set flags */
/* Set flags */
pic
->
key_frame
=
1
;
pic
->
key_frame
=
1
;
pic
->
pict_type
=
FF_I_TYPE
;
pic
->
pict_type
=
AV_PICTURE_TYPE_I
;
/* Version should always be 1 */
/* Version should always be 1 */
version
=
AV_RL32
(
src
);
version
=
AV_RL32
(
src
);
...
...
libavcodec/y41pdec.c
View file @
7099f365
...
@@ -64,7 +64,7 @@ static int y41p_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -64,7 +64,7 @@ static int y41p_decode_frame(AVCodecContext *avctx, void *data,
}
}
pic
->
key_frame
=
1
;
pic
->
key_frame
=
1
;
pic
->
pict_type
=
FF_I_TYPE
;
pic
->
pict_type
=
AV_PICTURE_TYPE_I
;
for
(
i
=
avctx
->
height
-
1
;
i
>=
0
;
i
--
)
{
for
(
i
=
avctx
->
height
-
1
;
i
>=
0
;
i
--
)
{
y
=
&
pic
->
data
[
0
][
i
*
pic
->
linesize
[
0
]];
y
=
&
pic
->
data
[
0
][
i
*
pic
->
linesize
[
0
]];
...
...
libavcodec/y41penc.c
View file @
7099f365
...
@@ -54,7 +54,7 @@ static int y41p_encode_frame(AVCodecContext *avctx, uint8_t *buf,
...
@@ -54,7 +54,7 @@ static int y41p_encode_frame(AVCodecContext *avctx, uint8_t *buf,
avctx
->
coded_frame
->
reference
=
0
;
avctx
->
coded_frame
->
reference
=
0
;
avctx
->
coded_frame
->
key_frame
=
1
;
avctx
->
coded_frame
->
key_frame
=
1
;
avctx
->
coded_frame
->
pict_type
=
FF_I_TYPE
;
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_I
;
for
(
i
=
avctx
->
height
-
1
;
i
>=
0
;
i
--
)
{
for
(
i
=
avctx
->
height
-
1
;
i
>=
0
;
i
--
)
{
y
=
&
pic
->
data
[
0
][
i
*
pic
->
linesize
[
0
]];
y
=
&
pic
->
data
[
0
][
i
*
pic
->
linesize
[
0
]];
...
...
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