Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
6785cae3
Commit
6785cae3
authored
17 years ago
by
Måns Rullgård
Browse files
Options
Downloads
Patches
Plain Diff
trivial warning fixes
Originally committed as revision 9551 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
4a64abdc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
libavcodec/h263_parser.c
+1
-1
1 addition, 1 deletion
libavcodec/h263_parser.c
libavcodec/wma.h
+1
-1
1 addition, 1 deletion
libavcodec/wma.h
libavcodec/wmaenc.c
+2
-2
2 additions, 2 deletions
libavcodec/wmaenc.c
libavcodec/zmbv.c
+1
-1
1 addition, 1 deletion
libavcodec/zmbv.c
with
5 additions
and
5 deletions
libavcodec/h263_parser.c
+
1
−
1
View file @
6785cae3
...
@@ -71,7 +71,7 @@ static int h263_parse(AVCodecParserContext *s,
...
@@ -71,7 +71,7 @@ static int h263_parse(AVCodecParserContext *s,
next
=
ff_h263_find_frame_end
(
pc
,
buf
,
buf_size
);
next
=
ff_h263_find_frame_end
(
pc
,
buf
,
buf_size
);
if
(
ff_combine_frame
(
pc
,
next
,
(
uint8_t
**
)
&
buf
,
&
buf_size
)
<
0
)
{
if
(
ff_combine_frame
(
pc
,
next
,
&
buf
,
&
buf_size
)
<
0
)
{
*
poutbuf
=
NULL
;
*
poutbuf
=
NULL
;
*
poutbuf_size
=
0
;
*
poutbuf_size
=
0
;
return
buf_size
;
return
buf_size
;
...
...
This diff is collapsed.
Click to expand it.
libavcodec/wma.h
+
1
−
1
View file @
6785cae3
...
@@ -92,7 +92,7 @@ typedef struct WMACodecContext {
...
@@ -92,7 +92,7 @@ typedef struct WMACodecContext {
uint16_t
*
run_table
[
2
];
uint16_t
*
run_table
[
2
];
uint16_t
*
level_table
[
2
];
uint16_t
*
level_table
[
2
];
uint16_t
*
int_table
[
2
];
uint16_t
*
int_table
[
2
];
CoefVLCTable
*
coef_vlcs
[
2
];
const
CoefVLCTable
*
coef_vlcs
[
2
];
/* frame info */
/* frame info */
int
frame_len
;
///< frame length in samples
int
frame_len
;
///< frame length in samples
int
frame_len_bits
;
///< frame_len = 1 << frame_len_bits
int
frame_len_bits
;
///< frame_len = 1 << frame_len_bits
...
...
This diff is collapsed.
Click to expand it.
libavcodec/wmaenc.c
+
2
−
2
View file @
6785cae3
...
@@ -94,7 +94,7 @@ static void apply_window_and_mdct(AVCodecContext * avctx, signed short * audio,
...
@@ -94,7 +94,7 @@ static void apply_window_and_mdct(AVCodecContext * avctx, signed short * audio,
}
}
//FIXME use for decoding too
//FIXME use for decoding too
static
void
init_exp
(
WMACodecContext
*
s
,
int
ch
,
int
*
exp_param
){
static
void
init_exp
(
WMACodecContext
*
s
,
int
ch
,
const
int
*
exp_param
){
int
n
;
int
n
;
const
uint16_t
*
ptr
;
const
uint16_t
*
ptr
;
float
v
,
*
q
,
max_scale
,
*
q_end
;
float
v
,
*
q
,
max_scale
,
*
q_end
;
...
@@ -324,7 +324,7 @@ static int encode_superframe(AVCodecContext *avctx,
...
@@ -324,7 +324,7 @@ static int encode_superframe(AVCodecContext *avctx,
unsigned
char
*
buf
,
int
buf_size
,
void
*
data
){
unsigned
char
*
buf
,
int
buf_size
,
void
*
data
){
WMACodecContext
*
s
=
avctx
->
priv_data
;
WMACodecContext
*
s
=
avctx
->
priv_data
;
short
*
samples
=
data
;
short
*
samples
=
data
;
int
i
,
total_gain
,
best
;
int
i
,
total_gain
;
s
->
block_len_bits
=
s
->
frame_len_bits
;
//required by non variable block len
s
->
block_len_bits
=
s
->
frame_len_bits
;
//required by non variable block len
s
->
block_len
=
1
<<
s
->
block_len_bits
;
s
->
block_len
=
1
<<
s
->
block_len_bits
;
...
...
This diff is collapsed.
Click to expand it.
libavcodec/zmbv.c
+
1
−
1
View file @
6785cae3
...
@@ -535,7 +535,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
...
@@ -535,7 +535,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
out
[
i
*
3
+
0
]
=
c
->
pal
[(
*
src
)
*
3
+
0
];
out
[
i
*
3
+
0
]
=
c
->
pal
[(
*
src
)
*
3
+
0
];
out
[
i
*
3
+
1
]
=
c
->
pal
[(
*
src
)
*
3
+
1
];
out
[
i
*
3
+
1
]
=
c
->
pal
[(
*
src
)
*
3
+
1
];
out
[
i
*
3
+
2
]
=
c
->
pal
[(
*
src
)
*
3
+
2
];
out
[
i
*
3
+
2
]
=
c
->
pal
[(
*
src
)
*
3
+
2
];
*
src
++
;
src
++
;
}
}
out
+=
c
->
pic
.
linesize
[
0
];
out
+=
c
->
pic
.
linesize
[
0
];
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment