Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
external
ffmpeg
Commits
e5b29c1f
Commit
e5b29c1f
authored
Sep 01, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
parent
feedc075
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
libavcodec/dpxenc.c
libavcodec/dpxenc.c
+1
-1
libavcodec/mpeg12.c
libavcodec/mpeg12.c
+1
-1
libavcodec/mpegvideo.c
libavcodec/mpegvideo.c
+2
-2
No files found.
libavcodec/dpxenc.c
View file @
e5b29c1f
...
...
@@ -35,7 +35,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
DPXContext
*
s
=
avctx
->
priv_data
;
avctx
->
coded_frame
=
&
s
->
picture
;
avctx
->
coded_frame
->
pict_type
=
FF_I
_TYPE
;
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE
_TYPE
_I
;
avctx
->
coded_frame
->
key_frame
=
1
;
s
->
big_endian
=
1
;
...
...
libavcodec/mpeg12.c
View file @
e5b29c1f
...
...
@@ -1167,7 +1167,7 @@ static int mpeg_decode_update_thread_context(AVCodecContext *avctx, const AVCode
if
(
!
ctx
->
mpeg_enc_ctx_allocated
)
memcpy
(
s
+
1
,
s1
+
1
,
sizeof
(
Mpeg1Context
)
-
sizeof
(
MpegEncContext
));
if
(
!
(
s
->
pict_type
==
FF_B
_TYPE
||
s
->
low_delay
))
if
(
!
(
s
->
pict_type
==
AV_PICTURE
_TYPE
_B
||
s
->
low_delay
))
s
->
picture_number
++
;
return
0
;
...
...
libavcodec/mpegvideo.c
View file @
e5b29c1f
...
...
@@ -539,7 +539,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src
s
->
last_pict_type
=
s1
->
pict_type
;
if
(
s1
->
current_picture_ptr
)
s
->
last_lambda_for
[
s1
->
pict_type
]
=
s1
->
current_picture_ptr
->
f
.
quality
;
if
(
s1
->
pict_type
!=
FF_B
_TYPE
)
{
if
(
s1
->
pict_type
!=
AV_PICTURE
_TYPE
_B
)
{
s
->
last_non_b_pict_type
=
s1
->
pict_type
;
}
}
...
...
@@ -2652,6 +2652,6 @@ void ff_set_qscale(MpegEncContext * s, int qscale)
void
MPV_report_decode_progress
(
MpegEncContext
*
s
)
{
if
(
s
->
pict_type
!=
FF_B
_TYPE
&&
!
s
->
partitioned_frame
&&
!
s
->
error_occurred
)
if
(
s
->
pict_type
!=
AV_PICTURE
_TYPE
_B
&&
!
s
->
partitioned_frame
&&
!
s
->
error_occurred
)
ff_thread_report_progress
((
AVFrame
*
)
s
->
current_picture_ptr
,
s
->
mb_y
,
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