diff options
| author | Lukasz Marek <lukasz.m.luki@gmail.com> | 2014-02-01 17:14:40 +0100 |
|---|---|---|
| committer | Lukasz Marek <lukasz.m.luki@gmail.com> | 2014-02-02 02:23:25 +0100 |
| commit | 1fb1ddf64749cd8ab023f2ab92e9a6e6dc7dde98 (patch) | |
| tree | 16eaf317c54428a1012f66b201c8d4729a460661 /libavdevice/opengl_enc.c | |
| parent | c8275331bac53ebbaff56a6eaa376920923bc54a (diff) | |
lavd/opengl_enc: simplify opengl_load_procedures usage
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Diffstat (limited to 'libavdevice/opengl_enc.c')
| -rw-r--r-- | libavdevice/opengl_enc.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index ff9ffc006d..7e5da48224 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -459,6 +459,11 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl) { FFOpenGLFunctions *procs = &opengl->glprocs; +#if HAVE_SDL + if (!opengl->no_window) + return opengl_sdl_load_procedures(opengl); +#endif + procs->glActiveTexture = glActiveTexture; procs->glGenBuffers = glGenBuffers; procs->glDeleteBuffers = glDeleteBuffers; @@ -504,6 +509,11 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl) return AVERROR(ENOSYS); \ } +#if HAVE_SDL + if (!opengl->no_window) + return opengl_sdl_load_procedures(opengl); +#endif + LOAD_OPENGL_FUN(glActiveTexture, FF_PFNGLACTIVETEXTUREPROC) LOAD_OPENGL_FUN(glGenBuffers, FF_PFNGLGENBUFFERSPROC) LOAD_OPENGL_FUN(glDeleteBuffers, FF_PFNGLDELETEBUFFERSPROC) @@ -1064,12 +1074,7 @@ static av_cold int opengl_write_header(AVFormatContext *h) goto fail; } - if (!opengl->no_window) { -#if HAVE_SDL - if ((ret = opengl_sdl_load_procedures(opengl)) < 0) - goto fail; -#endif - } else if ((ret = opengl_load_procedures(opengl)) < 0) + if ((ret = opengl_load_procedures(opengl)) < 0) goto fail; opengl_fill_color_map(opengl); |