diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 10:38:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 10:38:45 +0200 |
| commit | 9ab8de4b23908de3792540605e2c2e30892cc33d (patch) | |
| tree | 1c41bc801b5df4b5e9775788b921388942bf3917 /libavformat | |
| parent | be03912a7805bb40ae022b444b1dc75460bb3eea (diff) | |
| parent | 64af59bc4916fac5578b31c89da13c30b591bddf (diff) | |
Merge commit '64af59bc4916fac5578b31c89da13c30b591bddf'
* commit '64af59bc4916fac5578b31c89da13c30b591bddf':
avformat: Fix references to removed av_close_input_file in Doxygen
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 923e253f60..77efc61e72 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1513,7 +1513,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt, /** * Open an input stream and read the header. The codecs are not opened. - * The stream must be closed with av_close_input_file(). + * The stream must be closed with avformat_close_input(). * * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context). * May be a pointer to NULL, in which case an AVFormatContext is allocated by this @@ -1648,8 +1648,8 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt); * information possible for decoding. * * If pkt->buf is NULL, then the packet is valid until the next - * av_read_frame() or until av_close_input_file(). Otherwise the packet is valid - * indefinitely. In both cases the packet must be freed with + * av_read_frame() or until avformat_close_input(). Otherwise the packet + * is valid indefinitely. In both cases the packet must be freed with * av_free_packet when it is no longer needed. For video, the packet contains * exactly one frame. For audio, it contains an integer number of frames if each * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames |