[FFmpeg-devel] [PATCH 1/2] lavd/avdevice: replace av_ with ff_ for caps option table

James Almer jamrial at gmail.com
Sat Dec 13 20:42:55 CET 2014


On 13/12/14 4:27 PM, Lukasz Marek wrote:
> This symbol is required for query capabilities callbacks.
> This symbol is only required by libavdevice and should not be exported.

This need a deprecation and an FF_API scheduled removal. We can't remove the symbol 
without a major bump.

Also, an internal.h header for stuff like this is probably a good idea.

> 
> Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
> ---
>  libavdevice/avdevice.c | 2 +-
>  libavdevice/avdevice.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
> index 755f251..86deb82 100644
> --- a/libavdevice/avdevice.c
> +++ b/libavdevice/avdevice.c
> @@ -29,7 +29,7 @@
>  #define V AV_OPT_FLAG_VIDEO_PARAM
>  #define OFFSET(x) offsetof(AVDeviceCapabilitiesQuery, x)
>  
> -const AVOption av_device_capabilities[] = {
> +const AVOption ff_device_capabilities[] = {
>      { "codec", "codec", OFFSET(codec), AV_OPT_TYPE_INT,
>          {.i64 = AV_CODEC_ID_NONE}, AV_CODEC_ID_NONE, INT_MAX, E|D|A|V },
>      { "sample_format", "sample format", OFFSET(sample_format), AV_OPT_TYPE_INT,
> diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h
> index a395228..47e310b 100644
> --- a/libavdevice/avdevice.h
> +++ b/libavdevice/avdevice.h
> @@ -415,7 +415,7 @@ typedef struct AVDeviceCapabilitiesQuery {
>  /**
>   * AVOption table used by devices to implement device capabilities API. Should not be used by a user.
>   */
> -extern const AVOption av_device_capabilities[];
> +extern const AVOption ff_device_capabilities[];
>  
>  /**
>   * Initialize capabilities probing API based on AVOption API.
> 



More information about the ffmpeg-devel mailing list