Merge commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688'

[ffmpeg] / libavdevice / avdevice.h

diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h
index 6153f2cd46dbc14fd0cdbbdd59837a653efbfa08..ee9462480e2cddf00a3abe6a4d219d799391af5c 100644 (file)
--- a/libavdevice/avdevice.h
+++ b/libavdevice/avdevice.h
@@ -37,7 +37,7 @@
  * (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own
  * I/O functions). The filename passed to avformat_open_input() often does not
  * refer to an actually existing file, but has some special device-specific
- * meaning - e.g. for x11grab it is the display name.
+ * meaning - e.g. for xcbgrab it is the display name.
  *
  * To use libavdevice, simply call avdevice_register_all() to register all
  * compiled muxers and demuxers. They all use standard libavformat API.
@@ -67,7 +67,6 @@ const char *avdevice_license(void);
 
 /**
  * Initialize libavdevice and register all the input and output devices.
- * @warning This function is not thread safe.
  */
 void avdevice_register_all(void);