Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
云duo
FFmpeg
提交
8f12ef98
F
FFmpeg
项目概览
云duo
/
FFmpeg
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
FFmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8f12ef98
编写于
7月 28, 2015
作者:
V
Vittorio Giovara
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters
Deprecated in 10/2012.
上级
bf7114b6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
0 addition
and
170 deletion
+0
-170
libavcodec/avcodec.h
libavcodec/avcodec.h
+0
-33
libavcodec/utils.c
libavcodec/utils.c
+0
-35
libavutil/frame.h
libavutil/frame.h
+0
-99
libavutil/version.h
libavutil/version.h
+0
-3
未找到文件。
libavcodec/avcodec.h
浏览文件 @
8f12ef98
...
...
@@ -3346,39 +3346,6 @@ const AVClass *avcodec_get_class(void);
*/
int
avcodec_copy_context
(
AVCodecContext
*
dest
,
const
AVCodecContext
*
src
);
#if FF_API_AVFRAME_LAVC
/**
* @deprecated use av_frame_alloc()
*/
attribute_deprecated
AVFrame
*
avcodec_alloc_frame
(
void
);
/**
* Set the fields of the given AVFrame to default values.
*
* @param frame The AVFrame of which the fields should be set to default values.
*
* @deprecated use av_frame_unref()
*/
attribute_deprecated
void
avcodec_get_frame_defaults
(
AVFrame
*
frame
);
/**
* Free the frame and any dynamically allocated objects in it,
* e.g. extended_data.
*
* @param frame frame to be freed. The pointer will be set to NULL.
*
* @warning this function does NOT free the data buffers themselves
* (it does not know how, since they might have been allocated with
* a custom get_buffer()).
*
* @deprecated use av_frame_free()
*/
attribute_deprecated
void
avcodec_free_frame
(
AVFrame
**
frame
);
#endif
/**
* Initialize the AVCodecContext to use the given AVCodec. Prior to using this
* function the context has to be allocated with avcodec_alloc_context3().
...
...
libavcodec/utils.c
浏览文件 @
8f12ef98
...
...
@@ -818,41 +818,6 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt)
return
ret
;
}
#if FF_API_AVFRAME_LAVC
void
avcodec_get_frame_defaults
(
AVFrame
*
frame
)
{
if
(
frame
->
extended_data
!=
frame
->
data
)
av_freep
(
&
frame
->
extended_data
);
memset
(
frame
,
0
,
sizeof
(
AVFrame
));
frame
->
pts
=
AV_NOPTS_VALUE
;
frame
->
key_frame
=
1
;
frame
->
sample_aspect_ratio
=
(
AVRational
)
{
0
,
1
};
frame
->
format
=
-
1
;
/* unknown */
frame
->
extended_data
=
frame
->
data
;
}
AVFrame
*
avcodec_alloc_frame
(
void
)
{
AVFrame
*
frame
=
av_mallocz
(
sizeof
(
AVFrame
));
if
(
!
frame
)
return
NULL
;
FF_DISABLE_DEPRECATION_WARNINGS
avcodec_get_frame_defaults
(
frame
);
FF_ENABLE_DEPRECATION_WARNINGS
return
frame
;
}
void
avcodec_free_frame
(
AVFrame
**
frame
)
{
av_frame_free
(
frame
);
}
#endif
int
attribute_align_arg
avcodec_open2
(
AVCodecContext
*
avctx
,
const
AVCodec
*
codec
,
AVDictionary
**
options
)
{
int
ret
=
0
;
...
...
libavutil/frame.h
浏览文件 @
8f12ef98
...
...
@@ -201,11 +201,6 @@ typedef struct AVFrame {
*/
enum
AVPictureType
pict_type
;
#if FF_API_AVFRAME_LAVC
attribute_deprecated
uint8_t
*
base
[
AV_NUM_DATA_POINTERS
];
#endif
/**
* Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
*/
...
...
@@ -240,65 +235,6 @@ typedef struct AVFrame {
*/
int
quality
;
#if FF_API_AVFRAME_LAVC
attribute_deprecated
int
reference
;
/**
* QP table
*/
attribute_deprecated
int8_t
*
qscale_table
;
/**
* QP store stride
*/
attribute_deprecated
int
qstride
;
attribute_deprecated
int
qscale_type
;
/**
* mbskip_table[mb]>=1 if MB didn't change
* stride= mb_width = (width+15)>>4
*/
attribute_deprecated
uint8_t
*
mbskip_table
;
/**
* motion vector table
* @code
* example:
* int mv_sample_log2= 4 - motion_subsample_log2;
* int mb_width= (width+15)>>4;
* int mv_stride= (mb_width << mv_sample_log2) + 1;
* motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
* @endcode
*/
attribute_deprecated
int16_t
(
*
motion_val
[
2
])[
2
];
/**
* macroblock type table
* mb_type_base + mb_width + 2
*/
attribute_deprecated
uint32_t
*
mb_type
;
/**
* DCT coefficients
*/
attribute_deprecated
short
*
dct_coeff
;
/**
* motion reference frame index
* the order in which these are stored can depend on the codec.
*/
attribute_deprecated
int8_t
*
ref_index
[
2
];
#endif
/**
* for some private data of the user
*/
...
...
@@ -309,11 +245,6 @@ typedef struct AVFrame {
*/
uint64_t
error
[
AV_NUM_DATA_POINTERS
];
#if FF_API_AVFRAME_LAVC
attribute_deprecated
int
type
;
#endif
/**
* When decoding, this signals how much the picture must be delayed.
* extra_delay = repeat_pict / (2*fps)
...
...
@@ -335,17 +266,6 @@ typedef struct AVFrame {
*/
int
palette_has_changed
;
#if FF_API_AVFRAME_LAVC
attribute_deprecated
int
buffer_hints
;
/**
* Pan scan.
*/
attribute_deprecated
struct
AVPanScan
*
pan_scan
;
#endif
/**
* reordered opaque 64bit (generally an integer or a double precision float
* PTS but can be anything).
...
...
@@ -357,25 +277,6 @@ typedef struct AVFrame {
*/
int64_t
reordered_opaque
;
#if FF_API_AVFRAME_LAVC
/**
* @deprecated this field is unused
*/
attribute_deprecated
void
*
hwaccel_picture_private
;
attribute_deprecated
struct
AVCodecContext
*
owner
;
attribute_deprecated
void
*
thread_opaque
;
/**
* log2 of the size of the block which a single vector in motion_val represents:
* (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
*/
attribute_deprecated
uint8_t
motion_subsample_log2
;
#endif
/**
* Sample rate of the audio data.
*/
...
...
libavutil/version.h
浏览文件 @
8f12ef98
...
...
@@ -84,9 +84,6 @@
#ifndef FF_API_LLS_PRIVATE
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_AVFRAME_LAVC
#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
#ifndef FF_API_VDPAU
#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录