diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-11 13:48:50 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-18 00:41:27 +0200 |
commit | 00aa6dea3f3c1f15e55ba7d0dd99071065b7a3c7 (patch) | |
tree | d525fd04fbef896706e2d35599530e32396aa40c /libavformat/internal.h | |
parent | a43120b609db300a4b3fa086d6ac753c13e6bf6d (diff) |
avformat/mux: Remove redundant resetting
Now that ff_interleave_add_packet() always returns blank packets, the
input packet to ff_interleave_packet_per_dts() will always be blank on
return as well (if supplied) and the same goes for interleave_packet()
in mux.c. Document these facts and remove the redundant resetting that
happened in av_interleaved_write_frame().
The last reference to the (long removed) destruct field that AVPackets
once had has been removed as well when updating the documentation of
ff_interleave_packet_per_dts().
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/internal.h')
-rw-r--r-- | libavformat/internal.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index e9d7d6754a..7e4284b217 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -495,15 +495,12 @@ int ff_framehash_write_header(AVFormatContext *s); int ff_read_packet(AVFormatContext *s, AVPacket *pkt); /** - * Interleave a packet per dts in an output media file. + * Interleave an AVPacket per dts so it can be muxed. * - * Packets with pkt->destruct == av_destruct_packet will be freed inside this - * function, so they cannot be used after it. Note that calling av_packet_unref() - * on them is still safe. - * - * @param s media file handle + * @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 + * @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, |