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
6209669d
Commit
6209669d
authored
Apr 29, 2011
by
Stefano Sabatini
Committed by
Diego Biurrun
May 02, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().
Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
b178cd76
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
8 deletions
+8
-8
ffmpeg.c
ffmpeg.c
+1
-1
ffplay.c
ffplay.c
+1
-1
flvdec.c
libavcodec/flvdec.c
+1
-1
h264.c
libavcodec/h264.c
+1
-1
h264_cavlc.c
libavcodec/h264_cavlc.c
+1
-1
ituh263dec.c
libavcodec/ituh263dec.c
+1
-1
ratecontrol.c
libavcodec/ratecontrol.c
+1
-1
svq3.c
libavcodec/svq3.c
+1
-1
No files found.
ffmpeg.c
View file @
6209669d
...
...
@@ -1273,7 +1273,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
avg_bitrate
=
(
double
)(
video_size
*
8
)
/
ti1
/
1000
.
0
;
fprintf
(
vstats_file
,
"s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s "
,
(
double
)
video_size
/
1024
,
ti1
,
bitrate
,
avg_bitrate
);
fprintf
(
vstats_file
,
"type= %c
\n
"
,
av_get_pict
_type_char
(
enc
->
coded_frame
->
pict_type
));
fprintf
(
vstats_file
,
"type= %c
\n
"
,
av_get_picture
_type_char
(
enc
->
coded_frame
->
pict_type
));
}
}
...
...
ffplay.c
View file @
6209669d
...
...
@@ -1501,7 +1501,7 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1, int6
#if defined(DEBUG_SYNC) && 0
printf
(
"frame_type=%c clock=%0.3f pts=%0.3f
\n
"
,
av_get_pict_type_char
(
src_frame
->
pict_type
),
pts
,
pts1
);
av_get_pict
ure
_type_char
(
src_frame
->
pict_type
),
pts
,
pts1
);
#endif
return
queue_picture
(
is
,
src_frame
,
pts
,
pos
);
}
...
...
libavcodec/flvdec.c
View file @
6209669d
...
...
@@ -109,7 +109,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
if
(
s
->
avctx
->
debug
&
FF_DEBUG_PICT_INFO
){
av_log
(
s
->
avctx
,
AV_LOG_DEBUG
,
"%c esc_type:%d, qp:%d num:%d
\n
"
,
s
->
dropable
?
'D'
:
av_get_pict_type_char
(
s
->
pict_type
),
s
->
h263_flv
-
1
,
s
->
qscale
,
s
->
picture_number
);
s
->
dropable
?
'D'
:
av_get_pict
ure
_type_char
(
s
->
pict_type
),
s
->
h263_flv
-
1
,
s
->
qscale
,
s
->
picture_number
);
}
s
->
y_dc_scale_table
=
...
...
libavcodec/h264.c
View file @
6209669d
...
...
@@ -2204,7 +2204,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
h
->
slice_num
,
(
s
->
picture_structure
==
PICT_FRAME
?
"F"
:
s
->
picture_structure
==
PICT_TOP_FIELD
?
"T"
:
"B"
),
first_mb_in_slice
,
av_get_pict_type_char
(
h
->
slice_type
),
h
->
slice_type_fixed
?
" fix"
:
""
,
h
->
nal_unit_type
==
NAL_IDR_SLICE
?
" IDR"
:
""
,
av_get_pict
ure
_type_char
(
h
->
slice_type
),
h
->
slice_type_fixed
?
" fix"
:
""
,
h
->
nal_unit_type
==
NAL_IDR_SLICE
?
" IDR"
:
""
,
pps_id
,
h
->
frame_num
,
s
->
current_picture_ptr
->
field_poc
[
0
],
s
->
current_picture_ptr
->
field_poc
[
1
],
h
->
ref_count
[
0
],
h
->
ref_count
[
1
],
...
...
libavcodec/h264_cavlc.c
View file @
6209669d
...
...
@@ -584,7 +584,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h){
mb_type
--
;
decode_intra_mb
:
if
(
mb_type
>
25
){
av_log
(
h
->
s
.
avctx
,
AV_LOG_ERROR
,
"mb_type %d in %c slice too large at %d %d
\n
"
,
mb_type
,
av_get_pict_type_char
(
h
->
slice_type
),
s
->
mb_x
,
s
->
mb_y
);
av_log
(
h
->
s
.
avctx
,
AV_LOG_ERROR
,
"mb_type %d in %c slice too large at %d %d
\n
"
,
mb_type
,
av_get_pict
ure
_type_char
(
h
->
slice_type
),
s
->
mb_x
,
s
->
mb_y
);
return
-
1
;
}
partition_count
=
0
;
...
...
libavcodec/ituh263dec.c
View file @
6209669d
...
...
@@ -71,7 +71,7 @@ static const int h263_mb_type_b_map[15]= {
void
ff_h263_show_pict_info
(
MpegEncContext
*
s
){
if
(
s
->
avctx
->
debug
&
FF_DEBUG_PICT_INFO
){
av_log
(
s
->
avctx
,
AV_LOG_DEBUG
,
"qp:%d %c size:%d rnd:%d%s%s%s%s%s%s%s%s%s %d/%d
\n
"
,
s
->
qscale
,
av_get_pict_type_char
(
s
->
pict_type
),
s
->
qscale
,
av_get_pict
ure
_type_char
(
s
->
pict_type
),
s
->
gb
.
size_in_bits
,
1
-
s
->
no_rounding
,
s
->
obmc
?
" AP"
:
""
,
s
->
umvplus
?
" UMV"
:
""
,
...
...
libavcodec/ratecontrol.c
View file @
6209669d
...
...
@@ -788,7 +788,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run)
if
(
s
->
avctx
->
debug
&
FF_DEBUG_RC
){
av_log
(
s
->
avctx
,
AV_LOG_DEBUG
,
"%c qp:%d<%2.1f<%d %d want:%d total:%d comp:%f st_q:%2.2f size:%d var:%d/%d br:%d fps:%d
\n
"
,
av_get_pict_type_char
(
pict_type
),
qmin
,
q
,
qmax
,
picture_number
,
(
int
)
wanted_bits
/
1000
,
(
int
)
s
->
total_bits
/
1000
,
av_get_pict
ure
_type_char
(
pict_type
),
qmin
,
q
,
qmax
,
picture_number
,
(
int
)
wanted_bits
/
1000
,
(
int
)
s
->
total_bits
/
1000
,
br_compensation
,
short_term_q
,
s
->
frame_bits
,
pic
->
mb_var_sum
,
pic
->
mc_mb_var_sum
,
s
->
bit_rate
/
1000
,
(
int
)
fps
);
}
...
...
libavcodec/svq3.c
View file @
6209669d
...
...
@@ -941,7 +941,7 @@ static int svq3_decode_frame(AVCodecContext *avctx,
if
(
avctx
->
debug
&
FF_DEBUG_PICT_INFO
){
av_log
(
h
->
s
.
avctx
,
AV_LOG_DEBUG
,
"%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X
\n
"
,
av_get_pict_type_char
(
s
->
pict_type
),
h
->
halfpel_flag
,
h
->
thirdpel_flag
,
av_get_pict
ure
_type_char
(
s
->
pict_type
),
h
->
halfpel_flag
,
h
->
thirdpel_flag
,
s
->
adaptive_quant
,
s
->
qscale
,
h
->
slice_num
);
}
...
...
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