diff options
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 6f1f1c072a..98341ba217 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -107,7 +107,8 @@ typedef struct FFFormatContext { struct PacketList *parse_queue_end; /** * The generic code uses this as a temporary packet - * to parse packets; it may also be used for other means + * to parse packets or for muxing, especially flushing. + * For demuxers, it may also be used for other means * for short periods that are guaranteed not to overlap * with calls to av_read_frame() (or ff_read_packet()) * or with each other. @@ -746,18 +747,10 @@ int ff_add_attached_pic(AVFormatContext *s, AVStream *st, AVIOContext *pb, /** * Interleave an AVPacket per dts so it can be muxed. - * - * @param s an AVFormatContext for output. pkt resp. out will be added to - * resp. taken from its packet buffer. - * @param out the interleaved packet will be output here - * @param pkt the input packet; will be blank on return if not NULL - * @param flush 1 if no further packets are available as input and all - * remaining packets should be output - * @return 1 if a packet was output, 0 if no packet could be output - * (in which case out may be uninitialized), < 0 if an error occurred - */ -int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, - AVPacket *pkt, int flush); + * See the documentation of AVOutputFormat.interleave_packet for details. + */ +int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt, + int flush, int has_packet); void ff_free_stream(AVFormatContext *s, AVStream *st); |