Browse Source

avcodec/nvenc: Fix build with older gcc versions

Aparently anonymous structs weren't always supported, not even sure if
they are standard conformant.
tags/n2.8
Timo Rothenpieler 10 years ago
parent
commit
550e872bcd
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      libavcodec/nvenc.c

+ 5
- 5
libavcodec/nvenc.c View File

@@ -93,7 +93,7 @@ typedef struct NvencData
union { union {
int64_t timestamp; int64_t timestamp;
NvencOutputSurface *surface; NvencOutputSurface *surface;
};
} u;
} NvencData; } NvencData;


typedef struct NvencDataList typedef struct NvencDataList
@@ -296,7 +296,7 @@ static int data_queue_enqueue(NvencDataList* queue, NvencData *data)
static int out_surf_queue_enqueue(NvencDataList* queue, NvencOutputSurface* surface) static int out_surf_queue_enqueue(NvencDataList* queue, NvencOutputSurface* surface)
{ {
NvencData data; NvencData data;
data.surface = surface;
data.u.surface = surface;


return data_queue_enqueue(queue, &data); return data_queue_enqueue(queue, &data);
} }
@@ -308,13 +308,13 @@ static NvencOutputSurface* out_surf_queue_dequeue(NvencDataList* queue)
if (!res) if (!res)
return NULL; return NULL;


return res->surface;
return res->u.surface;
} }


static int timestamp_queue_enqueue(NvencDataList* queue, int64_t timestamp) static int timestamp_queue_enqueue(NvencDataList* queue, int64_t timestamp)
{ {
NvencData data; NvencData data;
data.timestamp = timestamp;
data.u.timestamp = timestamp;


return data_queue_enqueue(queue, &data); return data_queue_enqueue(queue, &data);
} }
@@ -326,7 +326,7 @@ static int64_t timestamp_queue_dequeue(NvencDataList* queue)
if (!res) if (!res)
return AV_NOPTS_VALUE; return AV_NOPTS_VALUE;


return res->timestamp;
return res->u.timestamp;
} }


#define CHECK_LOAD_FUNC(t, f, s) \ #define CHECK_LOAD_FUNC(t, f, s) \


Loading…
Cancel
Save