Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 19:48:31 +0000 (21:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 19:48:37 +0000 (21:48 +0200)
* commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46':
  avdevice: Give names to anonymously typedeffed structs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavdevice/bktr.c
libavdevice/fbdev_dec.c
libavdevice/jack_audio.c
libavdevice/oss_audio.c

@@@ -49,9 -50,8 +49,9 @@@
  #include <sys/time.h>
  #include <signal.h>
  #include <stdint.h>
 +#include "avdevice.h"
  
- typedef struct {
+ typedef struct VideoData {
      AVClass *class;
      int video_fd;
      int tuner_fd;
  #include "libavutil/time.h"
  #include "libavutil/parseutils.h"
  #include "libavutil/pixdesc.h"
 -#include "libavformat/avformat.h"
  #include "libavformat/internal.h"
 -
 -struct rgb_pixfmt_map_entry {
 -    int bits_per_pixel;
 -    int red_offset, green_offset, blue_offset, alpha_offset;
 -    enum AVPixelFormat pixfmt;
 -};
 -
 -static struct rgb_pixfmt_map_entry rgb_pixfmt_map[] = {
 -    // bpp, red_offset,  green_offset, blue_offset, alpha_offset, pixfmt
 -    {  32,       0,           8,          16,           24,   AV_PIX_FMT_RGBA  },
 -    {  32,      16,           8,           0,           24,   AV_PIX_FMT_BGRA  },
 -    {  32,       8,          16,          24,            0,   AV_PIX_FMT_ARGB  },
 -    {  32,       3,           2,           8,            0,   AV_PIX_FMT_ABGR  },
 -    {  24,       0,           8,          16,            0,   AV_PIX_FMT_RGB24 },
 -    {  24,      16,           8,           0,            0,   AV_PIX_FMT_BGR24 },
 -};
 -
 -static enum AVPixelFormat get_pixfmt_from_fb_varinfo(struct fb_var_screeninfo *varinfo)
 -{
 -    int i;
 -
 -    for (i = 0; i < FF_ARRAY_ELEMS(rgb_pixfmt_map); i++) {
 -        struct rgb_pixfmt_map_entry *entry = &rgb_pixfmt_map[i];
 -        if (entry->bits_per_pixel == varinfo->bits_per_pixel &&
 -            entry->red_offset     == varinfo->red.offset     &&
 -            entry->green_offset   == varinfo->green.offset   &&
 -            entry->blue_offset    == varinfo->blue.offset)
 -            return entry->pixfmt;
 -    }
 -
 -    return AV_PIX_FMT_NONE;
 -}
 +#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
Simple merge
Simple merge