[SCM] libav/experimental: Attempt to better document AVFMT_NOFILE.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:11 UTC 2013
The following commit has been merged in the experimental branch:
commit 40d9c544ac6efdc9a0aa42d2949ffb636cb7be01
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Fri Jan 19 22:54:50 2007 +0000
Attempt to better document AVFMT_NOFILE.
Originally committed as revision 7590 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 2c90e21..63e1e83 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -128,7 +128,8 @@ typedef struct AVFormatParameters {
enum CodecID audio_codec_id;
} AVFormatParameters;
-#define AVFMT_NOFILE 0x0001 /* no file should be opened */
+//! demuxer will use url_fopen, no opened file should be provided by the caller
+#define AVFMT_NOFILE 0x0001
#define AVFMT_NEEDNUMBER 0x0002 /* needs '%d' in filename */
#define AVFMT_SHOW_IDS 0x0008 /* show format stream IDs numbers */
#define AVFMT_RAWPICTURE 0x0020 /* format wants AVPicture structure for
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 07a4831..7e25478 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -270,6 +270,9 @@ int av_filename_number_test(const char *filename)
/**
* Guess file format.
+ *
+ * @param is_opened whether the file is already opened, determines whether
+ * demuxers with or without AVFMT_NOFILE are probed
*/
AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened)
{
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list