Re: [libav-devel] [PATCH 09/13] build: Drop support for old versions of libdc1394

2016-12-01 Thread Diego Biurrun 
On Thu, Dec 01, 2016 at 01:12:45PM +0100, Diego Biurrun wrote:
> On Thu, Dec 01, 2016 at 01:05:18PM +0100, Anton Khirnov wrote:
> > Quoting Diego Biurrun (2016-11-30 21:49:26)
> > > On Tue, Nov 29, 2016 at 03:29:17PM -0500, Vittorio Giovara wrote:
> > > > On Tue, Nov 29, 2016 at 1:34 PM, Diego Biurrun  wrote:
> > > > > --- a/libavdevice/libdc1394.c
> > > > > +++ b/libavdevice/libdc1394.c
> > > > > @@ -104,9 +79,6 @@ struct dc1394_frame_rate {
> > > > >  #define OFFSET(x) offsetof(dc1394_data, x)
> > > > >  #define DEC AV_OPT_FLAG_DECODING_PARAM
> > > > >  static const AVOption options[] = {
> > > > > -#if HAVE_LIBDC1394_1
> > > > > -{ "channel", "", offsetof(dc1394_data, channel), 
> > > > > AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
> > > > > -#endif
> > > > 
> > > > should this option be kept around and converted into a warning, so not
> > > > to break random scripts still in the wild?
> > > 
> > > That's a question for Anton, he added that option back in 2011.
> > 
> > Well, I only added it to replace the stuff in AVFormatParameters. But
> > for what my opinion here is worth (never used this device), if this
> > option is just for the obsolete library version then it didn't even
> > exist for any modern builds. So there should be no problem with just
> > dropping it.
> 
> The way of the dodo it shall go then...

Does this warrant a changelog entry?

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 09/13] build: Drop support for old versions of libdc1394

2016-12-01 Thread Diego Biurrun 
On Thu, Dec 01, 2016 at 01:05:18PM +0100, Anton Khirnov wrote:
> Quoting Diego Biurrun (2016-11-30 21:49:26)
> > On Tue, Nov 29, 2016 at 03:29:17PM -0500, Vittorio Giovara wrote:
> > > On Tue, Nov 29, 2016 at 1:34 PM, Diego Biurrun  wrote:
> > > > --- a/libavdevice/libdc1394.c
> > > > +++ b/libavdevice/libdc1394.c
> > > > @@ -104,9 +79,6 @@ struct dc1394_frame_rate {
> > > >  #define OFFSET(x) offsetof(dc1394_data, x)
> > > >  #define DEC AV_OPT_FLAG_DECODING_PARAM
> > > >  static const AVOption options[] = {
> > > > -#if HAVE_LIBDC1394_1
> > > > -{ "channel", "", offsetof(dc1394_data, channel), AV_OPT_TYPE_INT, 
> > > > {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
> > > > -#endif
> > > 
> > > should this option be kept around and converted into a warning, so not
> > > to break random scripts still in the wild?
> > 
> > That's a question for Anton, he added that option back in 2011.
> 
> Well, I only added it to replace the stuff in AVFormatParameters. But
> for what my opinion here is worth (never used this device), if this
> option is just for the obsolete library version then it didn't even
> exist for any modern builds. So there should be no problem with just
> dropping it.

The way of the dodo it shall go then...

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 09/13] build: Drop support for old versions of libdc1394

2016-12-01 Thread Anton Khirnov 
Quoting Diego Biurrun (2016-11-30 21:49:26)
> On Tue, Nov 29, 2016 at 03:29:17PM -0500, Vittorio Giovara wrote:
> > On Tue, Nov 29, 2016 at 1:34 PM, Diego Biurrun  wrote:
> > > --- a/libavdevice/libdc1394.c
> > > +++ b/libavdevice/libdc1394.c
> > > @@ -104,9 +79,6 @@ struct dc1394_frame_rate {
> > >  #define OFFSET(x) offsetof(dc1394_data, x)
> > >  #define DEC AV_OPT_FLAG_DECODING_PARAM
> > >  static const AVOption options[] = {
> > > -#if HAVE_LIBDC1394_1
> > > -{ "channel", "", offsetof(dc1394_data, channel), AV_OPT_TYPE_INT, 
> > > {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
> > > -#endif
> > 
> > should this option be kept around and converted into a warning, so not
> > to break random scripts still in the wild?
> 
> That's a question for Anton, he added that option back in 2011.

Well, I only added it to replace the stuff in AVFormatParameters. But
for what my opinion here is worth (never used this device), if this
option is just for the obsolete library version then it didn't even
exist for any modern builds. So there should be no problem with just
dropping it.

-- 
Anton Khirnov
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 09/13] build: Drop support for old versions of libdc1394

2016-11-30 Thread Diego Biurrun 
On Tue, Nov 29, 2016 at 03:29:17PM -0500, Vittorio Giovara wrote:
> On Tue, Nov 29, 2016 at 1:34 PM, Diego Biurrun  wrote:
> > --- a/libavdevice/libdc1394.c
> > +++ b/libavdevice/libdc1394.c
> > @@ -104,9 +79,6 @@ struct dc1394_frame_rate {
> >  #define OFFSET(x) offsetof(dc1394_data, x)
> >  #define DEC AV_OPT_FLAG_DECODING_PARAM
> >  static const AVOption options[] = {
> > -#if HAVE_LIBDC1394_1
> > -{ "channel", "", offsetof(dc1394_data, channel), AV_OPT_TYPE_INT, 
> > {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
> > -#endif
> 
> should this option be kept around and converted into a warning, so not
> to break random scripts still in the wild?

That's a question for Anton, he added that option back in 2011.

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 09/13] build: Drop support for old versions of libdc1394

2016-11-29 Thread Vittorio Giovara 
On Tue, Nov 29, 2016 at 1:34 PM, Diego Biurrun  wrote:
> index c823388..0fa3786 100644
> --- a/libavdevice/libdc1394.c
> +++ b/libavdevice/libdc1394.c
> @@ -20,26 +20,7 @@
>   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
> USA
>   */
>
> -#include "config.h"
> -
> -#if HAVE_LIBDC1394_2
>  #include 
> -#elif HAVE_LIBDC1394_1
> -#include 
> -#include 
> -
> -#define DC1394_VIDEO_MODE_320x240_YUV422 MODE_320x240_YUV422
> -#define DC1394_VIDEO_MODE_640x480_YUV411 MODE_640x480_YUV411
> -#define DC1394_VIDEO_MODE_640x480_YUV422 MODE_640x480_YUV422
> -#define DC1394_FRAMERATE_1_875 FRAMERATE_1_875
> -#define DC1394_FRAMERATE_3_75  FRAMERATE_3_75
> -#define DC1394_FRAMERATE_7_5   FRAMERATE_7_5
> -#define DC1394_FRAMERATE_15FRAMERATE_15
> -#define DC1394_FRAMERATE_30FRAMERATE_30
> -#define DC1394_FRAMERATE_60FRAMERATE_60
> -#define DC1394_FRAMERATE_120   FRAMERATE_120
> -#define DC1394_FRAMERATE_240   FRAMERATE_240
> -#endif
>
>  #include "libavutil/imgutils.h"
>  #include "libavutil/internal.h"
> @@ -54,15 +35,9 @@
>
>  typedef struct dc1394_data {
>  AVClass *class;
> -#if HAVE_LIBDC1394_1
> -raw1394handle_t handle;
> -dc1394_cameracapture camera;
> -int channel;
> -#elif HAVE_LIBDC1394_2
>  dc1394_t *d;
>  dc1394camera_t *camera;
>  dc1394video_frame_t *frame;
> -#endif
>  int current_frame;
>  int  frame_rate;/**< frames per 1000 seconds (fps * 1000) */
>  char *video_size;   /**< String describing video size, set by a 
> private option. */
> @@ -104,9 +79,6 @@ struct dc1394_frame_rate {
>  #define OFFSET(x) offsetof(dc1394_data, x)
>  #define DEC AV_OPT_FLAG_DECODING_PARAM
>  static const AVOption options[] = {
> -#if HAVE_LIBDC1394_1
> -{ "channel", "", offsetof(dc1394_data, channel), AV_OPT_TYPE_INT, {.i64 
> = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
> -#endif

should this option be kept around and converted into a warning, so not
to break random scripts still in the wild?

lgtm otherwise
-- 
Vittorio
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel