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
f01a1894
Commit
f01a1894
authored
Nov 09, 2002
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup
Originally committed as revision 1178 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
3810fbf5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
avcodec.h
libavcodec/avcodec.h
+9
-3
mpegvideo.c
libavcodec/mpegvideo.c
+3
-3
No files found.
libavcodec/avcodec.h
View file @
f01a1894
...
...
@@ -5,8 +5,8 @@
#define LIBAVCODEC_VERSION_INT 0x000406
#define LIBAVCODEC_VERSION "0.4.6"
#define LIBAVCODEC_BUILD 463
5
#define LIBAVCODEC_BUILD_STR "463
5
"
#define LIBAVCODEC_BUILD 463
6
#define LIBAVCODEC_BUILD_STR "463
6
"
enum
CodecID
{
CODEC_ID_NONE
,
...
...
@@ -122,7 +122,6 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG,
#define CODEC_FLAG_4MV 0x0004
/* 4 MV per MB allowed */
#define CODEC_FLAG_QPEL 0x0010
/* use qpel MC */
#define CODEC_FLAG_GMC 0x0020
/* use GMC */
#define CODEC_FLAG_TYPE 0x0040
/* fixed I/P frame type, from avctx->key_frame */
#define CODEC_FLAG_PART 0x0080
/* use data partitioning */
/* parent program gurantees that the input for b-frame containing streams is not written to
for at least s->max_b_frames+1 frames, if this is not set than the input will be copied */
...
...
@@ -760,6 +759,13 @@ typedef struct AVCodecContext {
* decoding: set by lavc
*/
int8_t
*
display_qscale_table
;
/**
* force specific pict_type.
* encoding; set by user (I/P/B_TYPE)
* decoding: unused
*/
int
force_type
;
}
AVCodecContext
;
typedef
struct
AVCodec
{
...
...
libavcodec/mpegvideo.c
View file @
f01a1894
...
...
@@ -410,7 +410,7 @@ int MPV_common_init(MpegEncContext *s)
/* divx501 bitstream reorder buffer */
CHECKED_ALLOCZ
(
s
->
bitstream_buffer
,
BITSTREAM_BUFFER_SIZE
);
/* cbp, ac_pred, pred_dir */
CHECKED_ALLOCZ
(
s
->
cbp_table
,
s
->
mb_num
*
sizeof
(
UINT8
))
CHECKED_ALLOCZ
(
s
->
pred_dir_table
,
s
->
mb_num
*
sizeof
(
UINT8
))
...
...
@@ -996,9 +996,9 @@ int MPV_encode_picture(AVCodecContext *avctx,
init_put_bits
(
&
s
->
pb
,
buf
,
buf_size
,
NULL
,
NULL
);
if
(
avctx
->
f
lags
&
CODEC_FLAG_TYPE
){
if
(
avctx
->
f
orce_type
){
s
->
input_pict_type
=
s
->
force_input_type
=
avctx
->
key_frame
?
I_TYPE
:
P_TYPE
;
s
->
force_input_type
=
avctx
->
force_type
;
}
else
if
(
s
->
flags
&
CODEC_FLAG_PASS2
){
s
->
input_pict_type
=
s
->
force_input_type
=
s
->
rc_context
.
entry
[
s
->
input_picture_number
].
new_pict_type
;
...
...
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