diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-06-15 15:52:05 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 00:38:39 +0200 |
| commit | 17fad33f81c7e9787fcdc17934fc1eee6c6aa4bf (patch) | |
| tree | 76c44f17b5260d9ad0ccf925516b6329c231f706 /libavformat | |
| parent | 5c14b282d1cc407f6b9efb03564ecac75fb59471 (diff) | |
| download | ffmpeg-17fad33f81c7e9787fcdc17934fc1eee6c6aa4bf.tar.gz | |
Change all uses of restrict to use av_restrict instead.
Defining restrict results - for some compilers - in changing other
uses of the restrict keyword also, e.g. __declspec(restrict) gets
changed to __declspec(__restrict) on MSVC. This causes compilation
failures. Therefore, using a private namespace macro instead is
more reliable and robust.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpenc.h | 4 | ||||
| -rw-r--r-- | libavformat/rtpenc_h263.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index b7e49b0d31..a83c633e73 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -86,7 +86,7 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size); void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size); void ff_rtp_send_vp8(AVFormatContext *s1, const uint8_t *buff, int size); -const uint8_t *ff_h263_find_resync_marker_reverse(const uint8_t *restrict start, - const uint8_t *restrict end); +const uint8_t *ff_h263_find_resync_marker_reverse(const uint8_t *av_restrict start, + const uint8_t *av_restrict end); #endif /* AVFORMAT_RTPENC_H */ diff --git a/libavformat/rtpenc_h263.c b/libavformat/rtpenc_h263.c index e14aaf1dbd..9cea013013 100644 --- a/libavformat/rtpenc_h263.c +++ b/libavformat/rtpenc_h263.c @@ -23,8 +23,8 @@ #include "avformat.h" #include "rtpenc.h" -const uint8_t *ff_h263_find_resync_marker_reverse(const uint8_t *restrict start, - const uint8_t *restrict end) +const uint8_t *ff_h263_find_resync_marker_reverse(const uint8_t *av_restrict start, + const uint8_t *av_restrict end) { const uint8_t *p = end - 1; start += 1; /* Make sure we never return the original start. */ |