RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-23 07:42:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '64af59bc4916fac5578b31c89da13c30b591bddf'

Browse Source 
* commit '64af59bc4916fac5578b31c89da13c30b591bddf':
  avformat: Fix references to removed av_close_input_file in Doxygen

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-21 10:38:19 +02:00
commit 9ab8de4b23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@ -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. * 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). * @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 * 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. * information possible for decoding.
* *
* If pkt->buf is NULL, then the packet is valid until the next * 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 * av_read_frame() or until avformat_close_input(). Otherwise the packet
* indefinitely. In both cases the packet must be freed with * 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 * 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 * 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 * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames