diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 02:13:46 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 02:47:54 +0100 |
commit | 2924514721bc32b500d6573899aed05cf6bbae67 (patch) | |
tree | 84e8e77f392efe32c2fb03734fc6c29945180d40 /libavformat/options.c | |
parent | b61170f51d2e4178b3e3e7f2961d4d191b7896e2 (diff) | |
parent | 9deaec782810d098bca11c9332fab2d2f4c5fb78 (diff) |
Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'
* commit '9deaec782810d098bca11c9332fab2d2f4c5fb78':
lavf: move internal fields from public to internal context
Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/options.c')
-rw-r--r-- | libavformat/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/options.c b/libavformat/options.c index 504404312c..22b922f89a 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -110,13 +110,13 @@ AVFormatContext *avformat_alloc_context(void) ic = av_malloc(sizeof(AVFormatContext)); if (!ic) return ic; avformat_get_context_defaults(ic); - ic->offset = AV_NOPTS_VALUE; ic->internal = av_mallocz(sizeof(*ic->internal)); if (!ic->internal) { avformat_free_context(ic); return NULL; } + ic->internal->offset = AV_NOPTS_VALUE; return ic; } |