On Tue, Nov 29, 2016 at 1:34 PM, Diego Biurrun <di...@biurrun.de> 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 <dc1394/dc1394.h>
> -#elif HAVE_LIBDC1394_1
> -#include <libraw1394/raw1394.h>
> -#include <libdc1394/dc1394_control.h>
> -
> -#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_15 FRAMERATE_15
> -#define DC1394_FRAMERATE_30 FRAMERATE_30
> -#define DC1394_FRAMERATE_60 FRAMERATE_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
