diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-27 11:52:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-27 11:59:39 +0200 |
| commit | 6999f8bcf56bb167124bf85bdaa89090acdd5d9c (patch) | |
| tree | 5bfb541bec48db787901f2441bd887d3629737ea /libavformat/avformat.h | |
| parent | ab31db06103c6ac0c1bd1f9fdfa93220d8801e19 (diff) | |
| parent | 904100e5fc13dacc954b1d093bf87bc44f4e7a7b (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
make av_interleaved_write_frame() flush packets when pkt is NULL
mpegts: Fix dead error checks
vc1: Do not read from array if index is invalid.
targa: convert to bytestream2.
rv34: set mb_num_left to 0 after finishing a frame
Conflicts:
libavcodec/targa.c
libavcodec/vc1data.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index fcdaebe2d4..7c307a7db2 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1607,6 +1607,8 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt); * @param s media file handle * @param pkt The packet containing the data to be written. Libavformat takes * ownership of the data and will free it when it sees fit using the packet's + * This can be NULL (at any time, not just at the end), to flush the + * interleaving queues. * @ref AVPacket.destruct "destruct" field. The caller must not access the data * after this function returns, as it may already be freed. * Packet's @ref AVPacket.stream_index "stream_index" field must be set to the |