aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-18 21:48:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-18 21:48:37 +0200
commitf6ed5df9c00c3fda2571ccc75e3055c215e4fc1a (patch)
tree7e4d134a502253d77a852536a0c31a66fa51f03d
parentcff61d595e453c15e37f4fdfdb3dba93d19f5fa9 (diff)
parentc0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46 (diff)
downloadffmpeg-f6ed5df9c00c3fda2571ccc75e3055c215e4fc1a.tar.gz
Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'
* commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46': avdevice: Give names to anonymously typedeffed structs Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavdevice/bktr.c2
-rw-r--r--libavdevice/fbdev_dec.c2
-rw-r--r--libavdevice/jack_audio.c2
-rw-r--r--libavdevice/oss_audio.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 50dcc7d214..d09d452d16 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -51,7 +51,7 @@
#include <stdint.h>
#include "avdevice.h"
-typedef struct {
+typedef struct VideoData {
AVClass *class;
int video_fd;
int tuner_fd;
diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c
index d53b9e591b..1593b102c7 100644
--- a/libavdevice/fbdev_dec.c
+++ b/libavdevice/fbdev_dec.c
@@ -45,7 +45,7 @@
#include "avdevice.h"
#include "fbdev_common.h"
-typedef struct {
+typedef struct FBDevContext {
AVClass *class; ///< class for private options
int frame_size; ///< size in bytes of a grabbed frame
AVRational framerate_q; ///< framerate
diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c
index 70aa6ffcc1..2fda8ad0a9 100644
--- a/libavdevice/jack_audio.c
+++ b/libavdevice/jack_audio.c
@@ -39,7 +39,7 @@
*/
#define FIFO_PACKETS_NUM 16
-typedef struct {
+typedef struct JackData {
AVClass *class;
jack_client_t * client;
int activated;
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index 734e565cc7..9a3cdcfdd1 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -46,7 +46,7 @@
#define AUDIO_BLOCK_SIZE 4096
-typedef struct {
+typedef struct AudioData {
AVClass *class;
int fd;
int sample_rate;