Change aac and ac3 parsers to use ff_combine_frame().

[ffmpeg] / libavcodec / roqvideo.h

diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index 202f32a39471664c0dc50c71127daf9d245fdc21..3345635ee86f28e804bceb87c004917efc9bf603 100644 (file)
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_ROQVIDEO_H
-#define AVCODEC_ROQVIDEO_H
+#ifndef FFMPEG_ROQVIDEO_H
+#define FFMPEG_ROQVIDEO_H
 
 #include "avcodec.h"
 #include "dsputil.h"
@@ -51,7 +51,7 @@ typedef struct RoqContext {
     roq_cell cb2x2[256];
     roq_qcell cb4x4[256];
 
-    unsigned char *buf;
+    const unsigned char *buf;
     int size;
     int width, height;
 
@@ -89,4 +89,4 @@ void ff_apply_motion_4x4(RoqContext *ri, int x, int y, int deltax, int deltay);
 
 void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay);
 
-#endif // AVCODEC_ROQVIDEO_H
+#endif /* FFMPEG_ROQVIDEO_H */