[FFmpeg-cvslog] lavd/opengl_enc: fix pixel data alignment

Lukasz Marek git at videolan.org
Mon May 5 00:41:57 CEST 2014


ffmpeg | branch: release/2.2 | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Wed Apr 30 20:49:52 2014 +0200| [c9c223ba0028498969019d4c133375b7c8d6c240] | committer: Michael Niedermayer

lavd/opengl_enc: fix pixel data alignment

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 8ff72924cfeb3c8fa8fc57cfea3f78ca0caaec0f)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9c223ba0028498969019d4c133375b7c8d6c240
---

 libavdevice/opengl_enc.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c
index 1b99390..5ca0c02 100644
--- a/libavdevice/opengl_enc.c
+++ b/libavdevice/opengl_enc.c
@@ -1204,6 +1204,8 @@ static int opengl_draw(AVFormatContext *h, void *input, int repaint, int is_pkt)
     glClear(GL_COLOR_BUFFER_BIT);
 
     if (!repaint) {
+        if (is_pkt)
+            glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
         LOAD_TEXTURE_DATA(0, 0)
         if (desc->flags & AV_PIX_FMT_FLAG_PLANAR) {
             LOAD_TEXTURE_DATA(1, 1)



More information about the ffmpeg-cvslog mailing list