diff options
| -rw-r--r-- | libavformat/internal.h | 4 | ||||
| -rw-r--r-- | libavformat/mux.c | 1 | ||||
| -rw-r--r-- | libavformat/mxfenc.c | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 7e4284b217..329b2e972d 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -503,8 +503,8 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt); * @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, - * < 0 if an error occurred + * @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); diff --git a/libavformat/mux.c b/libavformat/mux.c index 3d63d59faf..a6253f5430 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1144,7 +1144,6 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, return 1; } else { - av_init_packet(out); return 0; } } diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index bfce531f54..23147e9b84 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -3070,7 +3070,6 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket return 1; } else { out: - av_init_packet(out); return 0; } } |