Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
90b5b51e
Commit
90b5b51e
authored
Jun 12, 2007
by
Diego Biurrun
Browse files
misc typo fixes
Originally committed as revision 9291 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
c294d7c6
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
37 additions
and
34 deletions
+37
-34
doc/snow.txt
doc/snow.txt
+2
-2
libavcodec/adpcm.c
libavcodec/adpcm.c
+1
-1
libavcodec/dsputil.c
libavcodec/dsputil.c
+1
-1
libavcodec/eval.h
libavcodec/eval.h
+1
-1
libavcodec/flicvideo.c
libavcodec/flicvideo.c
+1
-1
libavcodec/h261dec.c
libavcodec/h261dec.c
+1
-1
libavcodec/h263.c
libavcodec/h263.c
+2
-2
libavcodec/h264.c
libavcodec/h264.c
+1
-1
libavcodec/h264.h
libavcodec/h264.h
+1
-1
libavcodec/huffyuv.c
libavcodec/huffyuv.c
+1
-1
libavcodec/i386/idct_mmx.c
libavcodec/i386/idct_mmx.c
+2
-2
libavcodec/i386/mpegvideo_mmx_template.c
libavcodec/i386/mpegvideo_mmx_template.c
+1
-1
libavcodec/motion_est.c
libavcodec/motion_est.c
+1
-1
libavcodec/mpeg12.c
libavcodec/mpeg12.c
+1
-1
libavcodec/mpeg4data.h
libavcodec/mpeg4data.h
+2
-1
libavcodec/mpegvideo.c
libavcodec/mpegvideo.c
+3
-2
libavcodec/msmpeg4.c
libavcodec/msmpeg4.c
+5
-4
libavcodec/resample2.c
libavcodec/resample2.c
+2
-2
libavformat/avformat.h
libavformat/avformat.h
+5
-5
libavformat/avio.h
libavformat/avio.h
+3
-3
No files found.
doc/snow.txt
View file @
90b5b51e
...
@@ -184,10 +184,10 @@ Neighboring Blocks:
...
@@ -184,10 +184,10 @@ Neighboring Blocks:
left and top are set to the respective blocks unless they are outside of
left and top are set to the respective blocks unless they are outside of
the image in which case they are set to the Null block
the image in which case they are set to the Null block
top-left is set to the top left block unless its outside of the image in
top-left is set to the top left block unless it
i
s outside of the image in
which case it is set to the left block
which case it is set to the left block
if this block has no larger parent block or its at the left side of its
if this block has no larger parent block or it
i
s at the left side of its
parent block and the top right block is not outside of the image then the
parent block and the top right block is not outside of the image then the
top right block is used for top-right else the top-left block is used
top right block is used for top-right else the top-left block is used
...
...
libavcodec/adpcm.c
View file @
90b5b51e
...
@@ -1272,7 +1272,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
...
@@ -1272,7 +1272,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
init_get_bits
(
&
gb
,
buf
,
size
);
init_get_bits
(
&
gb
,
buf
,
size
);
//read bits & inital values
//read bits & init
i
al values
nb_bits
=
get_bits
(
&
gb
,
2
)
+
2
;
nb_bits
=
get_bits
(
&
gb
,
2
)
+
2
;
//av_log(NULL,AV_LOG_INFO,"nb_bits: %d\n", nb_bits);
//av_log(NULL,AV_LOG_INFO,"nb_bits: %d\n", nb_bits);
table
=
swf_index_tables
[
nb_bits
-
2
];
table
=
swf_index_tables
[
nb_bits
-
2
];
...
...
libavcodec/dsputil.c
View file @
90b5b51e
...
@@ -3139,7 +3139,7 @@ void ff_block_permute(DCTELEM *block, uint8_t *permutation, const uint8_t *scant
...
@@ -3139,7 +3139,7 @@ void ff_block_permute(DCTELEM *block, uint8_t *permutation, const uint8_t *scant
DCTELEM
temp
[
64
];
DCTELEM
temp
[
64
];
if
(
last
<=
0
)
return
;
if
(
last
<=
0
)
return
;
//if(permutation[1]==1) return; //FIXME its ok but not clean and might fail for some perms
//if(permutation[1]==1) return; //FIXME it
i
s ok but not clean and might fail for some perm
utation
s
for
(
i
=
0
;
i
<=
last
;
i
++
){
for
(
i
=
0
;
i
<=
last
;
i
++
){
const
int
j
=
scantable
[
i
];
const
int
j
=
scantable
[
i
];
...
...
libavcodec/eval.h
View file @
90b5b51e
...
@@ -68,7 +68,7 @@ typedef struct ff_expr_s AVEvalExpr;
...
@@ -68,7 +68,7 @@ typedef struct ff_expr_s AVEvalExpr;
* @param func1_name NULL terminated array of zero terminated strings of func1 identifers
* @param func1_name NULL terminated array of zero terminated strings of func1 identifers
* @param func2_name NULL terminated array of zero terminated strings of func2 identifers
* @param func2_name NULL terminated array of zero terminated strings of func2 identifers
* @param error pointer to a char* which is set to an error message if something goes wrong
* @param error pointer to a char* which is set to an error message if something goes wrong
* @return AVEvalExpr which must be freed with ff_eval_free by the user when its not needed anymore
* @return AVEvalExpr which must be freed with ff_eval_free by the user when it
i
s not needed anymore
* NULL if anything went wrong
* NULL if anything went wrong
*/
*/
AVEvalExpr
*
ff_parse
(
char
*
s
,
const
char
**
const_name
,
AVEvalExpr
*
ff_parse
(
char
*
s
,
const
char
**
const_name
,
...
...
libavcodec/flicvideo.c
View file @
90b5b51e
...
@@ -584,7 +584,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
...
@@ -584,7 +584,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
* a second pass over the line here, swapping the bytes.
* a second pass over the line here, swapping the bytes.
*/
*/
pixel
=
0xFF00
;
pixel
=
0xFF00
;
if
(
0xFF00
!=
AV_RL16
(
&
pixel
))
/* Check if its not an LE
T
arget */
if
(
0xFF00
!=
AV_RL16
(
&
pixel
))
/* Check if it
i
s not an LE
t
arget */
{
{
pixel_ptr
=
y_ptr
;
pixel_ptr
=
y_ptr
;
pixel_countdown
=
s
->
avctx
->
width
;
pixel_countdown
=
s
->
avctx
->
width
;
...
...
libavcodec/h261dec.c
View file @
90b5b51e
...
@@ -164,7 +164,7 @@ static int ff_h261_resync(H261Context *h){
...
@@ -164,7 +164,7 @@ static int ff_h261_resync(H261Context *h){
if
(
ret
>=
0
)
if
(
ret
>=
0
)
return
0
;
return
0
;
}
}
//
ok
, its not where its supposed to be ...
//
OK
, it
i
s not where it
i
s supposed to be ...
s
->
gb
=
s
->
last_resync_gb
;
s
->
gb
=
s
->
last_resync_gb
;
align_get_bits
(
&
s
->
gb
);
align_get_bits
(
&
s
->
gb
);
left
=
s
->
gb
.
size_in_bits
-
get_bits_count
(
&
s
->
gb
);
left
=
s
->
gb
.
size_in_bits
-
get_bits_count
(
&
s
->
gb
);
...
...
libavcodec/h263.c
View file @
90b5b51e
...
@@ -3386,7 +3386,7 @@ int ff_h263_resync(MpegEncContext *s){
...
@@ -3386,7 +3386,7 @@ int ff_h263_resync(MpegEncContext *s){
if
(
ret
>=
0
)
if
(
ret
>=
0
)
return
0
;
return
0
;
}
}
//
ok
, it's not where its supposed to be ...
//
OK
, it's not where it
i
s supposed to be ...
s
->
gb
=
s
->
last_resync_gb
;
s
->
gb
=
s
->
last_resync_gb
;
align_get_bits
(
&
s
->
gb
);
align_get_bits
(
&
s
->
gb
);
left
=
s
->
gb
.
size_in_bits
-
get_bits_count
(
&
s
->
gb
);
left
=
s
->
gb
.
size_in_bits
-
get_bits_count
(
&
s
->
gb
);
...
@@ -4720,7 +4720,7 @@ retry:
...
@@ -4720,7 +4720,7 @@ retry:
i
+=
run
;
i
+=
run
;
if
(
i
>=
64
){
if
(
i
>=
64
){
if
(
s
->
alt_inter_vlc
&&
rl
==
&
rl_inter
&&
!
s
->
mb_intra
){
if
(
s
->
alt_inter_vlc
&&
rl
==
&
rl_inter
&&
!
s
->
mb_intra
){
//
l
ooks like a hack but no, it's the way its supposed to work ...
//
L
ooks like a hack but no, it's the way it
i
s supposed to work ...
rl
=
&
rl_intra_aic
;
rl
=
&
rl_intra_aic
;
i
=
0
;
i
=
0
;
s
->
gb
=
gb
;
s
->
gb
=
gb
;
...
...
libavcodec/h264.c
View file @
90b5b51e
...
@@ -1446,7 +1446,7 @@ static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *c
...
@@ -1446,7 +1446,7 @@ static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *c
*
dst_length
=
di
;
*
dst_length
=
di
;
*
consumed
=
si
+
1
;
//+1 for the header
*
consumed
=
si
+
1
;
//+1 for the header
//FIXME store exact number of bits in the getbitcontext (its needed for decoding)
//FIXME store exact number of bits in the getbitcontext (it
i
s needed for decoding)
return
dst
;
return
dst
;
}
}
...
...
libavcodec/h264.h
View file @
90b5b51e
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#include "mpegvideo.h"
#include "mpegvideo.h"
#define interlaced_dct interlaced_dct_is_a_bad_name
#define interlaced_dct interlaced_dct_is_a_bad_name
#define mb_intra mb_intra_is_not_initalized_see_mb_type
#define mb_intra mb_intra_is_not_init
i
alized_see_mb_type
#define LUMA_DC_BLOCK_INDEX 25
#define LUMA_DC_BLOCK_INDEX 25
#define CHROMA_DC_BLOCK_INDEX 26
#define CHROMA_DC_BLOCK_INDEX 26
...
...
libavcodec/huffyuv.c
View file @
90b5b51e
...
@@ -1169,7 +1169,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
...
@@ -1169,7 +1169,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
decode_bgr_bitstream
(
s
,
width
-
1
);
decode_bgr_bitstream
(
s
,
width
-
1
);
add_left_prediction_bgr32
(
p
->
data
[
0
]
+
last_line
+
4
,
s
->
temp
[
0
],
width
-
1
,
&
leftr
,
&
leftg
,
&
leftb
);
add_left_prediction_bgr32
(
p
->
data
[
0
]
+
last_line
+
4
,
s
->
temp
[
0
],
width
-
1
,
&
leftr
,
&
leftg
,
&
leftb
);
for
(
y
=
s
->
height
-
2
;
y
>=
0
;
y
--
){
//
y
es its stored upside down
for
(
y
=
s
->
height
-
2
;
y
>=
0
;
y
--
){
//
Y
es it
i
s stored upside down
.
decode_bgr_bitstream
(
s
,
width
);
decode_bgr_bitstream
(
s
,
width
);
add_left_prediction_bgr32
(
p
->
data
[
0
]
+
p
->
linesize
[
0
]
*
y
,
s
->
temp
[
0
],
width
,
&
leftr
,
&
leftg
,
&
leftb
);
add_left_prediction_bgr32
(
p
->
data
[
0
]
+
p
->
linesize
[
0
]
*
y
,
s
->
temp
[
0
],
width
,
&
leftr
,
&
leftg
,
&
leftb
);
...
...
libavcodec/i386/idct_mmx.c
View file @
90b5b51e
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
#define rounder(bias) {round (bias), round (bias)}
#define rounder(bias) {round (bias), round (bias)}
#if 0
#if 0
/* C row IDCT - its just here to document the MMXEXT and MMX versions */
/* C row IDCT - it
i
s just here to document the MMXEXT and MMX versions */
static inline void idct_row (int16_t * row, int offset,
static inline void idct_row (int16_t * row, int offset,
int16_t * table, int32_t * rounder)
int16_t * table, int32_t * rounder)
{
{
...
@@ -313,7 +313,7 @@ static inline void mmx_row_mid (int16_t * row, int store,
...
@@ -313,7 +313,7 @@ static inline void mmx_row_mid (int16_t * row, int store,
#if 0
#if 0
// C column IDCT - its just here to document the MMXEXT and MMX versions
// C column IDCT - it
i
s just here to document the MMXEXT and MMX versions
static inline void idct_col (int16_t * col, int offset)
static inline void idct_col (int16_t * col, int offset)
{
{
/* multiplication - as implemented on mmx */
/* multiplication - as implemented on mmx */
...
...
libavcodec/i386/mpegvideo_mmx_template.c
View file @
90b5b51e
...
@@ -96,7 +96,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
...
@@ -96,7 +96,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
int
qscale
,
int
*
overflow
)
int
qscale
,
int
*
overflow
)
{
{
long
last_non_zero_p1
;
long
last_non_zero_p1
;
int
level
=
0
,
q
;
//=0 is cuz gcc says uninitalized ...
int
level
=
0
,
q
;
//=0 is cuz gcc says uninit
i
alized ...
const
uint16_t
*
qmat
,
*
bias
;
const
uint16_t
*
qmat
,
*
bias
;
DECLARE_ALIGNED_16
(
int16_t
,
temp_block
[
64
]);
DECLARE_ALIGNED_16
(
int16_t
,
temp_block
[
64
]);
...
...
libavcodec/motion_est.c
View file @
90b5b51e
...
@@ -1807,7 +1807,7 @@ static inline int direct_search(MpegEncContext * s, int mb_x, int mb_y)
...
@@ -1807,7 +1807,7 @@ static inline int direct_search(MpegEncContext * s, int mb_x, int mb_y)
P_LEFT
[
1
]
=
av_clip
(
mv_table
[
mot_xy
-
1
][
1
],
ymin
<<
shift
,
ymax
<<
shift
);
P_LEFT
[
1
]
=
av_clip
(
mv_table
[
mot_xy
-
1
][
1
],
ymin
<<
shift
,
ymax
<<
shift
);
/* special case for first line */
/* special case for first line */
if
(
!
s
->
first_slice_line
)
{
//FIXME maybe allow this over thread boundary as its clipped
if
(
!
s
->
first_slice_line
)
{
//FIXME maybe allow this over thread boundary as it
i
s clipped
P_TOP
[
0
]
=
av_clip
(
mv_table
[
mot_xy
-
mot_stride
][
0
],
xmin
<<
shift
,
xmax
<<
shift
);
P_TOP
[
0
]
=
av_clip
(
mv_table
[
mot_xy
-
mot_stride
][
0
],
xmin
<<
shift
,
xmax
<<
shift
);
P_TOP
[
1
]
=
av_clip
(
mv_table
[
mot_xy
-
mot_stride
][
1
],
ymin
<<
shift
,
ymax
<<
shift
);
P_TOP
[
1
]
=
av_clip
(
mv_table
[
mot_xy
-
mot_stride
][
1
],
ymin
<<
shift
,
ymax
<<
shift
);
P_TOPRIGHT
[
0
]
=
av_clip
(
mv_table
[
mot_xy
-
mot_stride
+
1
][
0
],
xmin
<<
shift
,
xmax
<<
shift
);
P_TOPRIGHT
[
0
]
=
av_clip
(
mv_table
[
mot_xy
-
mot_stride
+
1
][
0
],
xmin
<<
shift
,
xmax
<<
shift
);
...
...
libavcodec/mpeg12.c
View file @
90b5b51e
...
@@ -3205,7 +3205,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
...
@@ -3205,7 +3205,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
return
-
1
;
return
-
1
;
}
}
if
(
!
s2
->
current_picture_ptr
){
if
(
!
s2
->
current_picture_ptr
){
av_log
(
avctx
,
AV_LOG_ERROR
,
"current_picture not initalized
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"current_picture not init
i
alized
\n
"
);
return
-
1
;
return
-
1
;
}
}
...
...
libavcodec/mpeg4data.h
View file @
90b5b51e
...
@@ -145,7 +145,8 @@ static RLTable rl_intra = {
...
@@ -145,7 +145,8 @@ static RLTable rl_intra = {
intra_level
,
intra_level
,
};
};
static
const
uint16_t
inter_rvlc
[
170
][
2
]
=
{
//note this is identical to the intra rvlc except that its reordered
/* Note this is identical to the intra rvlc except that it is reordered. */
static
const
uint16_t
inter_rvlc
[
170
][
2
]
=
{
{
0x0006
,
3
},{
0x0001
,
4
},{
0x0004
,
5
},{
0x001C
,
7
},
{
0x0006
,
3
},{
0x0001
,
4
},{
0x0004
,
5
},{
0x001C
,
7
},
{
0x003C
,
8
},{
0x003D
,
8
},{
0x007C
,
9
},{
0x00FC
,
10
},
{
0x003C
,
8
},{
0x003D
,
8
},{
0x007C
,
9
},{
0x00FC
,
10
},
{
0x00FD
,
10
},{
0x01FC
,
11
},{
0x01FD
,
11
},{
0x03FC
,
12
},
{
0x00FD
,
10
},{
0x01FC
,
11
},{
0x01FD
,
11
},{
0x03FC
,
12
},
...
...
libavcodec/mpegvideo.c
View file @
90b5b51e
...
@@ -441,11 +441,12 @@ static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
...
@@ -441,11 +441,12 @@ static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
CHECKED_ALLOCZ
(
pic
->
pan_scan
,
1
*
sizeof
(
AVPanScan
))
CHECKED_ALLOCZ
(
pic
->
pan_scan
,
1
*
sizeof
(
AVPanScan
))
}
}
//it might be nicer if the application would keep track of these but it would require a API change
/* It might be nicer if the application would keep track of these
* but it would require an API change. */
memmove
(
s
->
prev_pict_types
+
1
,
s
->
prev_pict_types
,
PREV_PICT_TYPES_BUFFER_SIZE
-
1
);
memmove
(
s
->
prev_pict_types
+
1
,
s
->
prev_pict_types
,
PREV_PICT_TYPES_BUFFER_SIZE
-
1
);
s
->
prev_pict_types
[
0
]
=
s
->
pict_type
;
s
->
prev_pict_types
[
0
]
=
s
->
pict_type
;
if
(
pic
->
age
<
PREV_PICT_TYPES_BUFFER_SIZE
&&
s
->
prev_pict_types
[
pic
->
age
]
==
B_TYPE
)
if
(
pic
->
age
<
PREV_PICT_TYPES_BUFFER_SIZE
&&
s
->
prev_pict_types
[
pic
->
age
]
==
B_TYPE
)
pic
->
age
=
INT_MAX
;
//
s
kipped MBs in
b
frames are quite rare in
mpeg
1/2 and its a bit tricky to skip them anyway
pic
->
age
=
INT_MAX
;
//
S
kipped MBs in
B-
frames are quite rare in
MPEG-
1/2 and it
i
s a bit tricky to skip them anyway
.
return
0
;
return
0
;
fail:
//for the CHECKED_ALLOCZ macro
fail:
//for the CHECKED_ALLOCZ macro
...
...
libavcodec/msmpeg4.c
View file @
90b5b51e
...
@@ -88,7 +88,7 @@ int frame_count = 0;
...
@@ -88,7 +88,7 @@ int frame_count = 0;
#include "msmpeg4data.h"
#include "msmpeg4data.h"
#include "msmpeg4tab.h"
#include "msmpeg4tab.h"
#ifdef CONFIG_ENCODERS //strangely gcc includes this even if its not references
#ifdef CONFIG_ENCODERS //strangely gcc includes this even if it
i
s not references
static
uint8_t
rl_length
[
NB_RL_TABLES
][
MAX_LEVEL
+
1
][
MAX_RUN
+
1
][
2
];
static
uint8_t
rl_length
[
NB_RL_TABLES
][
MAX_LEVEL
+
1
][
MAX_RUN
+
1
][
2
];
#endif //CONFIG_ENCODERS
#endif //CONFIG_ENCODERS
...
@@ -454,7 +454,7 @@ static void msmpeg4_encode_motion(MpegEncContext * s,
...
@@ -454,7 +454,7 @@ static void msmpeg4_encode_motion(MpegEncContext * s,
mv
->
table_mv_bits
[
code
],
mv
->
table_mv_bits
[
code
],
mv
->
table_mv_code
[
code
]);
mv
->
table_mv_code
[
code
]);
if
(
code
==
mv
->
n
)
{
if
(
code
==
mv
->
n
)
{
/* escape : code lit
t
erally */
/* escape : code literally */
put_bits
(
&
s
->
pb
,
6
,
mx
);
put_bits
(
&
s
->
pb
,
6
,
mx
);
put_bits
(
&
s
->
pb
,
6
,
my
);
put_bits
(
&
s
->
pb
,
6
,
my
);
}
}
...
@@ -983,7 +983,8 @@ static VLC v1_intra_cbpc_vlc;
...
@@ -983,7 +983,8 @@ static VLC v1_intra_cbpc_vlc;
static
VLC
v1_inter_cbpc_vlc
;
static
VLC
v1_inter_cbpc_vlc
;
static
VLC
inter_intra_vlc
;
static
VLC
inter_intra_vlc
;
/* this table is practically identical to the one from h263 except that its inverted */
/* This table is practically identical to the one from h263
* except that it is inverted. */
static
void
init_h263_dc_for_msmpeg4
(
void
)
static
void
init_h263_dc_for_msmpeg4
(
void
)
{
{
int
level
,
uni_code
,
uni_len
;
int
level
,
uni_code
,
uni_len
;
...
@@ -1380,7 +1381,7 @@ static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
...
@@ -1380,7 +1381,7 @@ static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
}
}
#endif
#endif
/*
t
his is identical to h263 except that its range is multiplied by 2 */
/*
T
his is identical to h263 except that its range is multiplied by 2
.
*/
static
int
msmpeg4v2_decode_motion
(
MpegEncContext
*
s
,
int
pred
,
int
f_code
)
static
int
msmpeg4v2_decode_motion
(
MpegEncContext
*
s
,
int
pred
,
int
f_code
)
{
{
int
code
,
val
,
sign
,
shift
;
int
code
,
val
,
sign
,
shift
;
...
...
libavcodec/resample2.c
View file @
90b5b51e
...
@@ -177,8 +177,8 @@ void av_build_filter(FELEM *filter, double factor, int tap_count, int phase_coun
...
@@ -177,8 +177,8 @@ void av_build_filter(FELEM *filter, double factor, int tap_count, int phase_coun
}
}
/**
/**
*
i
nitalizes a audio resampler.
*
I
nit
i
alizes a
n
audio resampler.
*
n
ote, if either rate is not a integer then simply scale both rates up so they are
*
N
ote, if either rate is not a
n
integer then simply scale both rates up so they are
.
*/
*/
AVResampleContext
*
av_resample_init
(
int
out_rate
,
int
in_rate
,
int
filter_size
,
int
phase_shift
,
int
linear
,
double
cutoff
){
AVResampleContext
*
av_resample_init
(
int
out_rate
,
int
in_rate
,
int
filter_size
,
int
phase_shift
,
int
linear
,
double
cutoff
){
AVResampleContext
*
c
=
av_mallocz
(
sizeof
(
AVResampleContext
));
AVResampleContext
*
c
=
av_mallocz
(
sizeof
(
AVResampleContext
));
...
...
libavformat/avformat.h
View file @
90b5b51e
...
@@ -259,7 +259,7 @@ typedef struct AVIndexEntry {
...
@@ -259,7 +259,7 @@ typedef struct AVIndexEntry {
int64_t
timestamp
;
int64_t
timestamp
;
#define AVINDEX_KEYFRAME 0x0001
#define AVINDEX_KEYFRAME 0x0001
int
flags
:
2
;
int
flags
:
2
;
int
size
:
30
;
//
y
eah trying to keep the size of this small to reduce memory requirements (its 24 vs 32 byte due to possible 8byte align)
int
size
:
30
;
//
Y
eah
,
trying to keep the size of this small to reduce memory requirements (it
i
s 24 vs 32 byte due to possible 8byte align)
.
int
min_distance
;
/**< min distance between this and the previous keyframe, used to avoid unneeded searching */
int
min_distance
;
/**< min distance between this and the previous keyframe, used to avoid unneeded searching */
}
AVIndexEntry
;
}
AVIndexEntry
;
...
@@ -720,10 +720,10 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
...
@@ -720,10 +720,10 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
*
*
* The packet must contain one audio or video frame.
* The packet must contain one audio or video frame.
* If the packets are already correctly interleaved the application should
* If the packets are already correctly interleaved the application should
* call av_write_frame() instead as it is slightly faster
, i
t is also important
* call av_write_frame() instead as it is slightly faster
. I
t is also important
* to keep in mind that completly non
interleaved input will need huge amounts
* to keep in mind that complet
e
ly non
-
interleaved input will need huge amounts
* of memory to interleave with this, so its prefer
e
able to interleave at the
* of memory to interleave with this, so it
i
s preferable to interleave at the
* demuxer level
* demuxer level
.
*
*
* @param s media file handle
* @param s media file handle
* @param pkt the packet, which contains the stream_index, buf/buf_size, dts/pts, ...
* @param pkt the packet, which contains the stream_index, buf/buf_size, dts/pts, ...
...
...
libavformat/avio.h
View file @
90b5b51e
...
@@ -85,9 +85,9 @@ void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
...
@@ -85,9 +85,9 @@ void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
int
url_poll
(
URLPollEntry
*
poll_table
,
int
n
,
int
timeout
);
int
url_poll
(
URLPollEntry
*
poll_table
,
int
n
,
int
timeout
);
/**
/**
*
p
assing this as the "whence" parameter to a seek function causes it to
*
P
assing this as the "whence" parameter to a seek function causes it to
* return the filesize without seeking anywhere
, s
upporting this is optional
* return the filesize without seeking anywhere
. S
upporting this is optional
.
*
i
f its not supprted then the seek function will return <0
*
I
f it
i
s not supp
o
rted then the seek function will return <0
.
*/
*/
#define AVSEEK_SIZE 0x10000
#define AVSEEK_SIZE 0x10000
...
...
Prev
1
2
Next
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