mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-30 20:16:42 +08:00 
			
		
		
		
	avdevice/libdc1394: add const to suppress "assignment discards const qualifier from pointer target type" warnings
See: http://fate.ffmpeg.org/log.cgi?time=20150919100330&log=compile&slot=x86_64-archlinux-gcc-enableshared Found-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
		| @@ -121,12 +121,12 @@ static const AVClass libdc1394_class = { | |||||||
|  |  | ||||||
|  |  | ||||||
| static inline int dc1394_read_common(AVFormatContext *c, | static inline int dc1394_read_common(AVFormatContext *c, | ||||||
|                                      struct dc1394_frame_format **select_fmt, struct dc1394_frame_rate **select_fps) |                                      const struct dc1394_frame_format **select_fmt, const struct dc1394_frame_rate **select_fps) | ||||||
| { | { | ||||||
|     dc1394_data* dc1394 = c->priv_data; |     dc1394_data* dc1394 = c->priv_data; | ||||||
|     AVStream* vst; |     AVStream* vst; | ||||||
|     struct dc1394_frame_format *fmt; |     const struct dc1394_frame_format *fmt; | ||||||
|     struct dc1394_frame_rate *fps; |     const struct dc1394_frame_rate *fps; | ||||||
|     enum AVPixelFormat pix_fmt; |     enum AVPixelFormat pix_fmt; | ||||||
|     int width, height; |     int width, height; | ||||||
|     AVRational framerate; |     AVRational framerate; | ||||||
| @@ -293,8 +293,8 @@ static int dc1394_v2_read_header(AVFormatContext *c) | |||||||
|     dc1394_data* dc1394 = c->priv_data; |     dc1394_data* dc1394 = c->priv_data; | ||||||
|     dc1394camera_list_t *list; |     dc1394camera_list_t *list; | ||||||
|     int res, i; |     int res, i; | ||||||
|     struct dc1394_frame_format *fmt = NULL; |     const struct dc1394_frame_format *fmt = NULL; | ||||||
|     struct dc1394_frame_rate *fps = NULL; |     const struct dc1394_frame_rate *fps = NULL; | ||||||
|  |  | ||||||
|     if (dc1394_read_common(c, &fmt, &fps) != 0) |     if (dc1394_read_common(c, &fmt, &fps) != 0) | ||||||
|        return -1; |        return -1; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Michael Niedermayer
					Michael Niedermayer