arm: dsputil: prettify some conditional instructions in put_pixels macros

[ffmpeg] / libavcodec / rtjpeg.h

diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h
index a5b377de5377f9e511c9da0f84cb75678fa25b75..95b59e9c75e03754452bdfba5f5e04a7bf624ae2 100644 (file)
--- a/libavcodec/rtjpeg.h
+++ b/libavcodec/rtjpeg.h
@@ -2,25 +2,25 @@
  * RTJpeg decoding functions
  * copyright (c) 2006 Reimar Doeffinger
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_RTJPEG_H
-#define FFMPEG_RTJPEG_H
+#ifndef AVCODEC_RTJPEG_H
+#define AVCODEC_RTJPEG_H
 
 #include <stdint.h>
 #include "dsputil.h"
@@ -31,12 +31,13 @@ typedef struct {
     uint8_t scan[64];
     uint32_t lquant[64];
     uint32_t cquant[64];
+    DECLARE_ALIGNED(16, DCTELEM, block)[64];
 } RTJpegContext;
 
-void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
+void ff_rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
                         int width, int height,
                         const uint32_t *lquant, const uint32_t *cquant);
 
-int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
+int ff_rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
                                const uint8_t *buf, int buf_size);
-#endif /* FFMPEG_RTJPEG_H */
+#endif /* AVCODEC_RTJPEG_H */