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/mxfenc.c | |
| parent | b61170f51d2e4178b3e3e7f2961d4d191b7896e2 (diff) | |
| parent | 9deaec782810d098bca11c9332fab2d2f4c5fb78 (diff) | |
| download | ffmpeg-2924514721bc32b500d6573899aed05cf6bbae67.tar.gz | |
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/mxfenc.c')
| -rw-r--r-- | libavformat/mxfenc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index a22974e1b4..17ad132865 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2322,7 +2322,7 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket stream_count += !!s->streams[i]->last_in_packet_buffer; if (stream_count && (s->nb_streams == stream_count || flush)) { - AVPacketList *pktl = s->packet_buffer; + AVPacketList *pktl = s->internal->packet_buffer; if (s->nb_streams != stream_count) { AVPacketList *last = NULL; // find last packet in edit unit @@ -2346,20 +2346,20 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket if (last) last->next = NULL; else { - s->packet_buffer = NULL; - s->packet_buffer_end= NULL; + s->internal->packet_buffer = NULL; + s->internal->packet_buffer_end= NULL; goto out; } - pktl = s->packet_buffer; + pktl = s->internal->packet_buffer; } *out = pktl->pkt; av_dlog(s, "out st:%d dts:%"PRId64"\n", (*out).stream_index, (*out).dts); - s->packet_buffer = pktl->next; + s->internal->packet_buffer = pktl->next; if(s->streams[pktl->pkt.stream_index]->last_in_packet_buffer == pktl) s->streams[pktl->pkt.stream_index]->last_in_packet_buffer= NULL; - if(!s->packet_buffer) - s->packet_buffer_end= NULL; + if(!s->internal->packet_buffer) + s->internal->packet_buffer_end= NULL; av_freep(&pktl); return 1; } else { |