Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
cea96420
Commit
cea96420
authored
Feb 19, 2008
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ;;
Originally committed as revision 12153 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
a56dcc57
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
12 deletions
+12
-12
ffplay.c
ffplay.c
+1
-1
flac.c
libavcodec/flac.c
+1
-1
g726.c
libavcodec/g726.c
+1
-1
h264.c
libavcodec/h264.c
+3
-3
mpegvideo.c
libavcodec/mpegvideo.c
+3
-3
vp3.c
libavcodec/vp3.c
+1
-1
vqavideo.c
libavcodec/vqavideo.c
+1
-1
segafilm.c
libavformat/segafilm.c
+1
-1
No files found.
ffplay.c
View file @
cea96420
...
@@ -657,7 +657,7 @@ static void video_image_display(VideoState *is)
...
@@ -657,7 +657,7 @@ static void video_image_display(VideoState *is)
aspect_ratio
=
0
;
aspect_ratio
=
0
;
else
else
aspect_ratio
=
av_q2d
(
is
->
video_st
->
codec
->
sample_aspect_ratio
)
aspect_ratio
=
av_q2d
(
is
->
video_st
->
codec
->
sample_aspect_ratio
)
*
is
->
video_st
->
codec
->
width
/
is
->
video_st
->
codec
->
height
;
;
*
is
->
video_st
->
codec
->
width
/
is
->
video_st
->
codec
->
height
;
if
(
aspect_ratio
<=
0
.
0
)
if
(
aspect_ratio
<=
0
.
0
)
aspect_ratio
=
(
float
)
is
->
video_st
->
codec
->
width
/
aspect_ratio
=
(
float
)
is
->
video_st
->
codec
->
width
/
(
float
)
is
->
video_st
->
codec
->
height
;
(
float
)
is
->
video_st
->
codec
->
height
;
...
...
libavcodec/flac.c
View file @
cea96420
...
@@ -721,7 +721,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
...
@@ -721,7 +721,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
// s->last_blocksize = s->blocksize;
// s->last_blocksize = s->blocksize;
end
:
end
:
i
=
(
get_bits_count
(
&
s
->
gb
)
+
7
)
/
8
;
;
i
=
(
get_bits_count
(
&
s
->
gb
)
+
7
)
/
8
;
if
(
i
>
buf_size
){
if
(
i
>
buf_size
){
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"overread: %d
\n
"
,
i
-
buf_size
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"overread: %d
\n
"
,
i
-
buf_size
);
s
->
bitstream_size
=
0
;
s
->
bitstream_size
=
0
;
...
...
libavcodec/g726.c
View file @
cea96420
...
@@ -387,7 +387,7 @@ static int g726_decode_frame(AVCodecContext *avctx,
...
@@ -387,7 +387,7 @@ static int g726_decode_frame(AVCodecContext *avctx,
mask
=
(
1
<<
c
->
code_size
)
-
1
;
mask
=
(
1
<<
c
->
code_size
)
-
1
;
init_get_bits
(
&
gb
,
buf
,
buf_size
*
8
);
init_get_bits
(
&
gb
,
buf
,
buf_size
*
8
);
if
(
c
->
bits_left
)
{
if
(
c
->
bits_left
)
{
int
s
=
c
->
code_size
-
c
->
bits_left
;
;
int
s
=
c
->
code_size
-
c
->
bits_left
;
code
=
(
c
->
bit_buffer
<<
s
)
|
get_bits
(
&
gb
,
s
);
code
=
(
c
->
bit_buffer
<<
s
)
|
get_bits
(
&
gb
,
s
);
*
samples
++
=
g726_decode
(
&
c
->
c
,
code
&
mask
);
*
samples
++
=
g726_decode
(
&
c
->
c
,
code
&
mask
);
}
}
...
...
libavcodec/h264.c
View file @
cea96420
...
@@ -2919,7 +2919,7 @@ static int fill_default_ref_list(H264Context *h){
...
@@ -2919,7 +2919,7 @@ static int fill_default_ref_list(H264Context *h){
if
(
sel
!=
PICT_FRAME
)
continue
;
if
(
sel
!=
PICT_FRAME
)
continue
;
frame_list
[
list
][
index
]
=
*
h
->
long_ref
[
i
];
frame_list
[
list
][
index
]
=
*
h
->
long_ref
[
i
];
frame_list
[
list
][
index
++
].
pic_id
=
i
;
;
frame_list
[
list
][
index
++
].
pic_id
=
i
;
}
}
len
[
list
]
=
index
;
len
[
list
]
=
index
;
}
}
...
@@ -2963,7 +2963,7 @@ static int fill_default_ref_list(H264Context *h){
...
@@ -2963,7 +2963,7 @@ static int fill_default_ref_list(H264Context *h){
sel
=
h
->
long_ref
[
i
]
->
reference
|
structure_sel
;
sel
=
h
->
long_ref
[
i
]
->
reference
|
structure_sel
;
if
(
sel
!=
PICT_FRAME
)
continue
;
if
(
sel
!=
PICT_FRAME
)
continue
;
frame_list
[
0
][
index
]
=
*
h
->
long_ref
[
i
];
frame_list
[
0
][
index
]
=
*
h
->
long_ref
[
i
];
frame_list
[
0
][
index
++
].
pic_id
=
i
;
;
frame_list
[
0
][
index
++
].
pic_id
=
i
;
}
}
if
(
FIELD_PICTURE
)
if
(
FIELD_PICTURE
)
...
@@ -5498,7 +5498,7 @@ static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int
...
@@ -5498,7 +5498,7 @@ static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int
if
(
!
qmul
)
{
if
(
!
qmul
)
{
block
[
j
]
=
get_cabac_bypass_sign
(
CC
,
-
1
);
block
[
j
]
=
get_cabac_bypass_sign
(
CC
,
-
1
);
}
else
{
}
else
{
block
[
j
]
=
(
get_cabac_bypass_sign
(
CC
,
-
qmul
[
j
])
+
32
)
>>
6
;
;
block
[
j
]
=
(
get_cabac_bypass_sign
(
CC
,
-
qmul
[
j
])
+
32
)
>>
6
;
}
}
abslevel1
++
;
abslevel1
++
;
...
...
libavcodec/mpegvideo.c
View file @
cea96420
...
@@ -1097,8 +1097,8 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h
...
@@ -1097,8 +1097,8 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h
for
(
y
=
0
;
y
<=
ey
;
y
++
){
for
(
y
=
0
;
y
<=
ey
;
y
++
){
x
=
(
y
*
f
)
>>
16
;
x
=
(
y
*
f
)
>>
16
;
fr
=
(
y
*
f
)
&
0xFFFF
;
fr
=
(
y
*
f
)
&
0xFFFF
;
buf
[
y
*
stride
+
x
]
+=
(
color
*
(
0x10000
-
fr
))
>>
16
;
;
buf
[
y
*
stride
+
x
]
+=
(
color
*
(
0x10000
-
fr
))
>>
16
;
buf
[
y
*
stride
+
x
+
1
]
+=
(
color
*
fr
)
>>
16
;
;
buf
[
y
*
stride
+
x
+
1
]
+=
(
color
*
fr
)
>>
16
;
}
}
}
}
}
}
...
@@ -2129,7 +2129,7 @@ void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
...
@@ -2129,7 +2129,7 @@ void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
offset
[
2
]
=
offset
[
2
]
=
offset
[
3
]
=
0
;
offset
[
3
]
=
0
;
}
else
{
}
else
{
offset
[
0
]
=
y
*
s
->
linesize
;
;
offset
[
0
]
=
y
*
s
->
linesize
;
offset
[
1
]
=
offset
[
1
]
=
offset
[
2
]
=
(
y
>>
s
->
chroma_y_shift
)
*
s
->
uvlinesize
;
offset
[
2
]
=
(
y
>>
s
->
chroma_y_shift
)
*
s
->
uvlinesize
;
offset
[
3
]
=
0
;
offset
[
3
]
=
0
;
...
...
libavcodec/vp3.c
View file @
cea96420
...
@@ -473,7 +473,7 @@ static int init_block_mapping(Vp3DecodeContext *s)
...
@@ -473,7 +473,7 @@ static int init_block_mapping(Vp3DecodeContext *s)
current_width
=
-
1
;
current_width
=
-
1
;
current_height
=
0
;
current_height
=
0
;
superblock_row_inc
=
s
->
macroblock_width
-
superblock_row_inc
=
s
->
macroblock_width
-
(
s
->
y_superblock_width
*
2
-
s
->
macroblock_width
);
;
(
s
->
y_superblock_width
*
2
-
s
->
macroblock_width
);
hilbert
=
hilbert_walk_mb
;
hilbert
=
hilbert_walk_mb
;
mapping_index
=
0
;
mapping_index
=
0
;
current_macroblock
=
-
1
;
current_macroblock
=
-
1
;
...
...
libavcodec/vqavideo.c
View file @
cea96420
...
@@ -133,7 +133,7 @@ static int vqa_decode_init(AVCodecContext *avctx)
...
@@ -133,7 +133,7 @@ static int vqa_decode_init(AVCodecContext *avctx)
{
{
VqaContext
*
s
=
avctx
->
priv_data
;
VqaContext
*
s
=
avctx
->
priv_data
;
unsigned
char
*
vqa_header
;
unsigned
char
*
vqa_header
;
int
i
,
j
,
codebook_index
;
;
int
i
,
j
,
codebook_index
;
s
->
avctx
=
avctx
;
s
->
avctx
=
avctx
;
avctx
->
pix_fmt
=
PIX_FMT_PAL8
;
avctx
->
pix_fmt
=
PIX_FMT_PAL8
;
...
...
libavformat/segafilm.c
View file @
cea96420
...
@@ -107,7 +107,7 @@ static int film_read_header(AVFormatContext *s,
...
@@ -107,7 +107,7 @@ static int film_read_header(AVFormatContext *s,
/* normal Saturn .cpk files; 32-byte header */
/* normal Saturn .cpk files; 32-byte header */
if
(
get_buffer
(
pb
,
scratch
,
32
)
!=
32
)
if
(
get_buffer
(
pb
,
scratch
,
32
)
!=
32
)
return
AVERROR
(
EIO
);
return
AVERROR
(
EIO
);
film
->
audio_samplerate
=
AV_RB16
(
&
scratch
[
24
]);
;
film
->
audio_samplerate
=
AV_RB16
(
&
scratch
[
24
]);
film
->
audio_channels
=
scratch
[
21
];
film
->
audio_channels
=
scratch
[
21
];
film
->
audio_bits
=
scratch
[
22
];
film
->
audio_bits
=
scratch
[
22
];
if
(
film
->
audio_bits
==
8
)
if
(
film
->
audio_bits
==
8
)
...
...
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