avcodec: rename the AV1 profiles

[ffmpeg] / libavcodec / h263.h

diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index 6105805fae1c990378a8551ee37484f1208a6f31..ce697da20e68ce3e82b19772c15a5c943f6cdcd7 100644 (file)
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -1,5 +1,5 @@
 /*
- * H263 internal header
+ * H.263 internal header
  *
  * This file is part of Libav.
  *
@@ -21,15 +21,17 @@
 #define AVCODEC_H263_H
 
 #include <stdint.h>
+
+#include "config.h"
+
 #include "libavutil/rational.h"
+
 #include "get_bits.h"
 #include "mpegvideo.h"
 #include "h263data.h"
 #include "rl.h"
 
-#if !FF_API_ASPECT_EXTENDED
 #define FF_ASPECT_EXTENDED 15
-#endif
 #define INT_BIT (CHAR_BIT * sizeof(int))
 
 // The defines below define the number of bits that are read at once for
@@ -87,7 +89,7 @@ int ff_h263_decode_mb(MpegEncContext *s,
                       int16_t block[6][64]);
 
 /**
- * Return the value of the 3bit "source format" syntax element.
+ * Return the value of the 3-bit "source format" syntax element.
  * This represents some standard picture dimensions or indicates that
  * width&height are explicitly stored later.
  */
@@ -95,7 +97,7 @@ int av_const h263_get_picture_format(int width, int height);
 
 void ff_clean_h263_qscales(MpegEncContext *s);
 int ff_h263_resync(MpegEncContext *s);
-const uint8_t *ff_h263_find_resync_marker(const uint8_t *p, const uint8_t *end);
+const uint8_t *ff_h263_find_resync_marker(const uint8_t *restrict p, const uint8_t *restrict end);
 void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code);
 
 
@@ -117,7 +119,7 @@ static inline int h263_get_motion_length(MpegEncContext * s, int val, int f_code
 }
 
 static inline void ff_h263_encode_motion_vector(MpegEncContext * s, int x, int y, int f_code){
-    if (s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT) {
+    if (s->avctx->flags2 & AV_CODEC_FLAG2_NO_OUTPUT) {
         skip_put_bits(&s->pb,
             h263_get_motion_length(s, x, f_code)
            +h263_get_motion_length(s, y, f_code));