avutil/frame: Remove deprecated AVFrame.error

[ffmpeg] / libavdevice / avdevice.h

diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h
index dd6ad9365e231e01c0a4d521e3fd2c0fea8b2b08..85a4dcc6df96f5e87694f9fae8b0b1d5ae069fae 100644 (file)
--- a/libavdevice/avdevice.h
+++ b/libavdevice/avdevice.h
@@ -65,29 +65,6 @@ const char *avdevice_configuration(void);
  */
 const char *avdevice_license(void);
 
-/**
- * Iterate over all registered output devices.
- *
- * @param opaque a pointer where libavdevice will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered output device or NULL when the iteration is
- *         finished
- */
-const AVOutputFormat *av_outdev_iterate(void **opaque);
-
-/**
- * Iterate over all registered input devices.
- *
- * @param opaque a pointer where libavdevice will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered input device or NULL when the iteration is
- *         finished
- */
-const AVInputFormat *av_indev_iterate(void **opaque);
-
-#if FF_API_NEXT
 /**
  * Initialize libavdevice and register all the input and output devices.
  */
@@ -100,7 +77,6 @@ void avdevice_register_all(void);
  * if d is non-NULL, returns the next registered input audio/video device after d
  * or NULL if d is the last one.
  */
-attribute_deprecated
 AVInputFormat *av_input_audio_device_next(AVInputFormat  *d);
 
 /**
@@ -110,7 +86,6 @@ AVInputFormat *av_input_audio_device_next(AVInputFormat  *d);
  * if d is non-NULL, returns the next registered input audio/video device after d
  * or NULL if d is the last one.
  */
-attribute_deprecated
 AVInputFormat *av_input_video_device_next(AVInputFormat  *d);
 
 /**
@@ -120,7 +95,6 @@ AVInputFormat *av_input_video_device_next(AVInputFormat  *d);
  * if d is non-NULL, returns the next registered output audio/video device after d
  * or NULL if d is the last one.
  */
-attribute_deprecated
 AVOutputFormat *av_output_audio_device_next(AVOutputFormat *d);
 
 /**
@@ -130,9 +104,7 @@ AVOutputFormat *av_output_audio_device_next(AVOutputFormat *d);
  * if d is non-NULL, returns the next registered output audio/video device after d
  * or NULL if d is the last one.
  */
-attribute_deprecated
 AVOutputFormat *av_output_video_device_next(AVOutputFormat *d);
-#endif
 
 typedef struct AVDeviceRect {
     int x;      /**< x coordinate of top left corner */
@@ -349,6 +321,7 @@ int avdevice_dev_to_app_control_message(struct AVFormatContext *s,
                                         enum AVDevToAppMessageType type,
                                         void *data, size_t data_size);
 
+#if FF_API_DEVICE_CAPABILITIES
 /**
  * Following API allows user to probe device capabilities (supported codecs,
  * pixel formats, sample formats, resolutions, channel counts, etc).
@@ -444,6 +417,7 @@ typedef struct AVDeviceCapabilitiesQuery {
 /**
  * AVOption table used by devices to implement device capabilities API. Should not be used by a user.
  */
+attribute_deprecated
 extern const AVOption av_device_capabilities[];
 
 /**
@@ -463,6 +437,7 @@ extern const AVOption av_device_capabilities[];
  *
  * @return >= 0 on success, negative otherwise.
  */
+attribute_deprecated
 int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s,
                                  AVDictionary **device_options);
 
@@ -472,7 +447,9 @@ int avdevice_capabilities_create(AVDeviceCapabilitiesQuery **caps, AVFormatConte
  * @param caps Device capabilities data to be freed.
  * @param s    Context of the device.
  */
+attribute_deprecated
 void avdevice_capabilities_free(AVDeviceCapabilitiesQuery **caps, AVFormatContext *s);
+#endif
 
 /**
  * Structure describes basic parameters of the device.