diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 03:18:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 03:18:44 +0100 |
| commit | 38a08e0aea0255e8a960bd5d6b21104c889f27f2 (patch) | |
| tree | d03453f7a0ce15802b7a333a9956e2d28cabf1b5 /libavdevice/opengl_enc_shaders.h | |
| parent | b02b78341799f8c2b013b7168f8687d835e47a1c (diff) | |
| parent | 81c3f81d6f11bf1dad9c6f3de5938e665447b991 (diff) | |
| download | ffmpeg-38a08e0aea0255e8a960bd5d6b21104c889f27f2.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd: add list devices API
lavd/opengl_enc_shaders: fix gray* shader
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/opengl_enc_shaders.h')
| -rw-r--r-- | libavdevice/opengl_enc_shaders.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/opengl_enc_shaders.h b/libavdevice/opengl_enc_shaders.h index 6378dfb8cc..ed8b3d3041 100644 --- a/libavdevice/opengl_enc_shaders.h +++ b/libavdevice/opengl_enc_shaders.h @@ -181,7 +181,7 @@ static const char * const FF_OPENGL_FRAGMENT_SHADER_GRAY = "varying vec2 texture_coordinate;" "void main()" "{" - "float c = texture2D(u_texture0, texture_coordinate);" + "float c = texture2D(u_texture0, texture_coordinate).r;" "gl_FragColor = vec4(c, c, c, 1.0);" "}"; |