diff options
Diffstat (limited to 'libavdevice')
-rw-r--r-- | libavdevice/alldevices.c | 16 | ||||
-rw-r--r-- | libavdevice/avdevice.h | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 92b27a1d14..f65317018a 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -68,7 +68,7 @@ void avdevice_register_all(void) avpriv_register_devices(outdev_list, indev_list); } -static void *next_input(const AVInputFormat *prev, AVClassCategory c2) +static const void *next_input(const AVInputFormat *prev, AVClassCategory c2) { const AVClass *pc; const AVClassCategory c1 = AV_CLASS_CATEGORY_DEVICE_INPUT; @@ -91,10 +91,10 @@ static void *next_input(const AVInputFormat *prev, AVClassCategory c2) continue; category = pc->category; } while (category != c1 && category != c2); - return (AVInputFormat *)fmt; + return fmt; } -static void *next_output(const AVOutputFormat *prev, AVClassCategory c2) +static const void *next_output(const AVOutputFormat *prev, AVClassCategory c2) { const AVClass *pc; const AVClassCategory c1 = AV_CLASS_CATEGORY_DEVICE_OUTPUT; @@ -117,25 +117,25 @@ static void *next_output(const AVOutputFormat *prev, AVClassCategory c2) continue; category = pc->category; } while (category != c1 && category != c2); - return (AVOutputFormat *)fmt; + return fmt; } -AVInputFormat *av_input_audio_device_next(AVInputFormat *d) +const AVInputFormat *av_input_audio_device_next(const AVInputFormat *d) { return next_input(d, AV_CLASS_CATEGORY_DEVICE_AUDIO_INPUT); } -AVInputFormat *av_input_video_device_next(AVInputFormat *d) +const AVInputFormat *av_input_video_device_next(const AVInputFormat *d) { return next_input(d, AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT); } -AVOutputFormat *av_output_audio_device_next(AVOutputFormat *d) +const AVOutputFormat *av_output_audio_device_next(const AVOutputFormat *d) { return next_output(d, AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT); } -AVOutputFormat *av_output_video_device_next(AVOutputFormat *d) +const AVOutputFormat *av_output_video_device_next(const AVOutputFormat *d) { return next_output(d, AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT); } diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index d0b0f23f5d..8370bbc7f2 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -77,7 +77,7 @@ 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. */ -AVInputFormat *av_input_audio_device_next(AVInputFormat *d); +const AVInputFormat *av_input_audio_device_next(const AVInputFormat *d); /** * Video input devices iterator. @@ -86,7 +86,7 @@ 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. */ -AVInputFormat *av_input_video_device_next(AVInputFormat *d); +const AVInputFormat *av_input_video_device_next(const AVInputFormat *d); /** * Audio output devices iterator. @@ -95,7 +95,7 @@ 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. */ -AVOutputFormat *av_output_audio_device_next(AVOutputFormat *d); +const AVOutputFormat *av_output_audio_device_next(const AVOutputFormat *d); /** * Video output devices iterator. @@ -104,7 +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. */ -AVOutputFormat *av_output_video_device_next(AVOutputFormat *d); +const AVOutputFormat *av_output_video_device_next(const AVOutputFormat *d); typedef struct AVDeviceRect { int x; /**< x coordinate of top left corner */ |