You've already forked FFmpeg
							
							
				mirror of
				https://github.com/FFmpeg/FFmpeg.git
				synced 2025-10-30 23:18:11 +02:00 
			
		
		
		
	Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'
* commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46': avdevice: Give names to anonymously typedeffed structs Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		| @@ -51,7 +51,7 @@ | |||||||
| #include <stdint.h> | #include <stdint.h> | ||||||
| #include "avdevice.h" | #include "avdevice.h" | ||||||
|  |  | ||||||
| typedef struct { | typedef struct VideoData { | ||||||
|     AVClass *class; |     AVClass *class; | ||||||
|     int video_fd; |     int video_fd; | ||||||
|     int tuner_fd; |     int tuner_fd; | ||||||
|   | |||||||
| @@ -45,7 +45,7 @@ | |||||||
| #include "avdevice.h" | #include "avdevice.h" | ||||||
| #include "fbdev_common.h" | #include "fbdev_common.h" | ||||||
|  |  | ||||||
| typedef struct { | typedef struct FBDevContext { | ||||||
|     AVClass *class;          ///< class for private options |     AVClass *class;          ///< class for private options | ||||||
|     int frame_size;          ///< size in bytes of a grabbed frame |     int frame_size;          ///< size in bytes of a grabbed frame | ||||||
|     AVRational framerate_q;  ///< framerate |     AVRational framerate_q;  ///< framerate | ||||||
|   | |||||||
| @@ -39,7 +39,7 @@ | |||||||
|  */ |  */ | ||||||
| #define FIFO_PACKETS_NUM 16 | #define FIFO_PACKETS_NUM 16 | ||||||
|  |  | ||||||
| typedef struct { | typedef struct JackData { | ||||||
|     AVClass        *class; |     AVClass        *class; | ||||||
|     jack_client_t * client; |     jack_client_t * client; | ||||||
|     int             activated; |     int             activated; | ||||||
|   | |||||||
| @@ -46,7 +46,7 @@ | |||||||
|  |  | ||||||
| #define AUDIO_BLOCK_SIZE 4096 | #define AUDIO_BLOCK_SIZE 4096 | ||||||
|  |  | ||||||
| typedef struct { | typedef struct AudioData { | ||||||
|     AVClass *class; |     AVClass *class; | ||||||
|     int fd; |     int fd; | ||||||
|     int sample_rate; |     int sample_rate; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user