Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
df968050
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
df968050
编写于
10月 19, 2011
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavf: move private fields in AVFormatContext to the end at next bump.
上级
a2faa951
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
48 addition
and
0 deletion
+48
-0
libavformat/avformat.h
libavformat/avformat.h
+45
-0
libavformat/version.h
libavformat/version.h
+3
-0
未找到文件。
libavformat/avformat.h
浏览文件 @
df968050
...
@@ -695,6 +695,7 @@ typedef struct AVFormatContext {
...
@@ -695,6 +695,7 @@ typedef struct AVFormatContext {
#endif
#endif
int
ctx_flags
;
/**< Format-specific flags, see AVFMTCTX_xx */
int
ctx_flags
;
/**< Format-specific flags, see AVFMTCTX_xx */
#if FF_API_REORDER_PRIVATE
/* private data for pts handling (do not modify directly). */
/* private data for pts handling (do not modify directly). */
/**
/**
* This buffer is only needed when packets were already buffered but
* This buffer is only needed when packets were already buffered but
...
@@ -702,6 +703,7 @@ typedef struct AVFormatContext {
...
@@ -702,6 +703,7 @@ typedef struct AVFormatContext {
* streams.
* streams.
*/
*/
struct
AVPacketList
*
packet_buffer
;
struct
AVPacketList
*
packet_buffer
;
#endif
/**
/**
* Decoding: position of the first frame of the component, in
* Decoding: position of the first frame of the component, in
...
@@ -732,11 +734,13 @@ typedef struct AVFormatContext {
...
@@ -732,11 +734,13 @@ typedef struct AVFormatContext {
*/
*/
int
bit_rate
;
int
bit_rate
;
#if FF_API_REORDER_PRIVATE
/* av_read_frame() support */
/* av_read_frame() support */
AVStream
*
cur_st
;
AVStream
*
cur_st
;
/* av_seek_frame() support */
/* av_seek_frame() support */
int64_t
data_offset
;
/**< offset of the first packet */
int64_t
data_offset
;
/**< offset of the first packet */
#endif
#if FF_API_MUXRATE
#if FF_API_MUXRATE
/**
/**
...
@@ -843,6 +847,7 @@ typedef struct AVFormatContext {
...
@@ -843,6 +847,7 @@ typedef struct AVFormatContext {
int
debug
;
int
debug
;
#define FF_FDEBUG_TS 0x0001
#define FF_FDEBUG_TS 0x0001
#if FF_API_REORDER_PRIVATE
/**
/**
* Raw packets from the demuxer, prior to parsing and decoding.
* Raw packets from the demuxer, prior to parsing and decoding.
* This buffer is used for buffering packets until the codec can
* This buffer is used for buffering packets until the codec can
...
@@ -853,15 +858,18 @@ typedef struct AVFormatContext {
...
@@ -853,15 +858,18 @@ typedef struct AVFormatContext {
struct
AVPacketList
*
raw_packet_buffer_end
;
struct
AVPacketList
*
raw_packet_buffer_end
;
struct
AVPacketList
*
packet_buffer_end
;
struct
AVPacketList
*
packet_buffer_end
;
#endif
AVDictionary
*
metadata
;
AVDictionary
*
metadata
;
#if FF_API_REORDER_PRIVATE
/**
/**
* Remaining size available for raw_packet_buffer, in bytes.
* Remaining size available for raw_packet_buffer, in bytes.
* NOT PART OF PUBLIC API
* NOT PART OF PUBLIC API
*/
*/
#define RAW_PACKET_BUFFER_SIZE 2500000
#define RAW_PACKET_BUFFER_SIZE 2500000
int
raw_packet_buffer_remaining_size
;
int
raw_packet_buffer_remaining_size
;
#endif
/**
/**
* Start time of the stream in real world time, in microseconds
* Start time of the stream in real world time, in microseconds
...
@@ -884,6 +892,43 @@ typedef struct AVFormatContext {
...
@@ -884,6 +892,43 @@ typedef struct AVFormatContext {
* - decoding: Set by user.
* - decoding: Set by user.
*/
*/
int
error_recognition
;
int
error_recognition
;
/*****************************************************************
* All fields below this line are not part of the public API. They
* may not be used outside of libavformat and can be changed and
* removed at will.
* New public fields should be added right above.
*****************************************************************
*/
#if !FF_API_REORDER_PRIVATE
/**
* Raw packets from the demuxer, prior to parsing and decoding.
* This buffer is used for buffering packets until the codec can
* be identified, as parsing cannot be done without knowing the
* codec.
*/
struct
AVPacketList
*
raw_packet_buffer
;
struct
AVPacketList
*
raw_packet_buffer_end
;
/**
* Remaining size available for raw_packet_buffer, in bytes.
*/
#define RAW_PACKET_BUFFER_SIZE 2500000
int
raw_packet_buffer_remaining_size
;
/**
* This buffer is only needed when packets were already buffered but
* not decoded, for example to get the codec parameters in MPEG
* streams.
*/
struct
AVPacketList
*
packet_buffer
;
struct
AVPacketList
*
packet_buffer_end
;
/* av_read_frame() support */
AVStream
*
cur_st
;
/* av_seek_frame() support */
int64_t
data_offset
;
/**< offset of the first packet */
#endif
}
AVFormatContext
;
}
AVFormatContext
;
typedef
struct
AVPacketList
{
typedef
struct
AVPacketList
{
...
...
libavformat/version.h
浏览文件 @
df968050
...
@@ -107,5 +107,8 @@
...
@@ -107,5 +107,8 @@
#ifndef FF_API_SEEK_PUBLIC
#ifndef FF_API_SEEK_PUBLIC
#define FF_API_SEEK_PUBLIC (LIBAVFORMAT_VERSION_MAJOR < 54)
#define FF_API_SEEK_PUBLIC (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif
#ifndef FF_API_REORDER_PRIVATE
#define FF_API_REORDER_PRIVATE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif
/* AVFORMAT_VERSION_H */
#endif
/* AVFORMAT_VERSION_H */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录