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

2014-12-13 Thread Lukasz Marek 
This symbol is required for query capabilities callbacks.
This symbol is only required by libavdevice and should not be exported.

Signed-off-by: Lukasz Marek lukasz.m.lu...@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.
-- 
1.9.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2014-12-13 Thread James Almer 
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.lu...@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.
 

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2014-12-13 Thread Reimar Döffinger 
On 13.12.2014, at 20:42, James Almer jamr...@gmail.com wrote:
 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.

Well, there is a comment saying it should not be used (which raises the 
question why it was placed in that header though).
If a search can't find anyone using it, it might not be _completely_ 
unreasonable to cheat and remove it without a major bump.
But I have no strong opinion either way.

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

Yes.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2014-12-13 Thread Lukasz Marek 

On 13.12.2014 20:48, Reimar Döffinger wrote:

On 13.12.2014, at 20:42, James Almer jamr...@gmail.com wrote:

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.


Well, there is a comment saying it should not be used (which raises the 
question why it was placed in that header though).
If a search can't find anyone using it, it might not be _completely_ 
unreasonable to cheat and remove it without a major bump.
But I have no strong opinion either way.


Yes. There is a comment about that it is internal. So I don't think it 
is serious to rename it. We already renamed symbols, but probably in not 
exported headers though.


Unless user created own device and implemented capabilities query, it is 
not used yet. It is not used in ffmpeg project. I'm about to push first 
implementations so I wanted to fix it before, as spotted.



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


Yes.


OK, I will move it.

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

2014-12-13 Thread Lukasz Marek 

On 13.12.2014 20:54, Lukasz Marek wrote:

On 13.12.2014 20:48, Reimar Döffinger wrote:

On 13.12.2014, at 20:42, James Almer jamr...@gmail.com wrote:

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.


Well, there is a comment saying it should not be used (which raises
the question why it was placed in that header though).
If a search can't find anyone using it, it might not be _completely_
unreasonable to cheat and remove it without a major bump.
But I have no strong opinion either way.


Yes. There is a comment about that it is internal. So I don't think it
is serious to rename it. We already renamed symbols, but probably in not
exported headers though.

Unless user created own device and implemented capabilities query, it is
not used yet. It is not used in ffmpeg project. I'm about to push first
implementations so I wanted to fix it before, as spotted.


Now I have second thought, removing/renaming this symbol will not allow 
to do that. (to implement device outside ffmpeg project and use caps 
querying). It is quite long since discussion about this API and I forget 
context of some things.


So this should stay as it is, just the comment have to be clarified it 
can be used just for this purpose, not to mangle with values manually


Sorry for double posting.

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel