diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 19:57:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 20:30:58 +0100 |
| commit | 8560fdc45195e310c52e3ce431f8ce3082078936 (patch) | |
| tree | ffde6f4bf02c33b2be9abf64ba42462f0ea3b79b /libavformat/avformat.h | |
| parent | e93674c4a322143c27caa83d63e3fec2fa3d3956 (diff) | |
| parent | 394fb56c29eee7f4f8f0334d8b5d30d3c54ac703 (diff) | |
| download | ffmpeg-8560fdc45195e310c52e3ce431f8ce3082078936.tar.gz | |
Merge commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703'
* commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703':
lavf: always unref the packet passed to av_interleaved_write_frame() on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1c44f87837..2d62b5b4f0 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2085,7 +2085,8 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt); * correct values. * @endparblock * - * @return 0 on success, a negative AVERROR on error. + * @return 0 on success, a negative AVERROR on error. Libavformat will always + * take care of freeing the packet, even if this function fails. * * @see av_write_frame(), AVFormatContext.max_interleave_delta */ |