[FFmpeg-devel] lavc/mips: fix mpegvideo.h includes (UNTESTED)

Submitted by Clément Bœsch on March 21, 2017, 2:24 p.m.

Details

Message ID 20170321142438.16052-1-u@pkh.me
State New
Headers show

Commit Message

Clément Bœsch March 21, 2017, 2:24 p.m.
---
 libavcodec/mips/blockdsp_mips.h    | 3 ++-
 libavcodec/mips/idctdsp_mips.h     | 3 ++-
 libavcodec/mips/me_cmp_mips.h      | 2 +-
 libavcodec/mips/pixblockdsp_mips.h | 3 ++-
 libavcodec/mips/qpeldsp_mips.h     | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

Comments

Michael Niedermayer March 21, 2017, 5:44 p.m.
On Tue, Mar 21, 2017 at 03:24:37PM +0100, Clément Bœsch wrote:
> ---
>  libavcodec/mips/blockdsp_mips.h    | 3 ++-
>  libavcodec/mips/idctdsp_mips.h     | 3 ++-
>  libavcodec/mips/me_cmp_mips.h      | 2 +-
>  libavcodec/mips/pixblockdsp_mips.h | 3 ++-
>  libavcodec/mips/qpeldsp_mips.h     | 3 ++-
>  5 files changed, 9 insertions(+), 5 deletions(-)

CC      libavdevice/avdevice.o
CC      libavfilter/avfilter.o
CC      libavformat/utils.o
CC      libavcodec/mips/blockdsp_init_mips.o
CC      libavcodec/mips/idctdsp_init_mips.o
CC      libavcodec/mips/me_cmp_init_mips.o
CC      libavcodec/mips/pixblockdsp_init_mips.o
CC      libavcodec/mips/qpeldsp_init_mips.o
src/libavformat/utils.c: In function ‘av_format_get_open_cb’:
src/libavformat/utils.c:118: warning: ‘open_cb’ is deprecated (declared at src/libavformat/avformat.h:1869)
src/libavformat/utils.c: In function ‘av_format_set_open_cb’:
src/libavformat/utils.c:118: warning: ‘open_cb’ is deprecated (declared at src/libavformat/avformat.h:1869)
src/libavformat/utils.c: In function ‘find_decoder’:
src/libavformat/utils.c:169: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:170: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘set_codec_from_probe_data’:
src/libavformat/utils.c:359: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:360: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘update_stream_avctx’:
src/libavformat/utils.c:498: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘ff_compute_frame_duration’:
src/libavformat/utils.c:918: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:918: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:919: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:919: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘compute_pkt_fields’:
src/libavformat/utils.c:1371: warning: ‘convergence_duration’ is deprecated (declared at src/libavcodec/avcodec.h:1670)
src/libavformat/utils.c:1371: warning: ‘convergence_duration’ is deprecated (declared at src/libavcodec/avcodec.h:5101)
src/libavformat/utils.c: In function ‘read_frame_internal’:
src/libavformat/utils.c:1555: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:1681: warning: ‘av_packet_merge_side_data’ is deprecated (declared at src/libavcodec/avcodec.h:4581)
src/libavformat/utils.c: In function ‘avformat_find_stream_info’:
src/libavformat/utils.c:3428: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3429: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3430: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3431: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3910: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3917: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3918: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3919: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3922: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3923: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3924: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3926: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3929: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3930: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3932: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3933: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3934: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3938: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3939: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:3940: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘free_stream’:
src/libavformat/utils.c:4149: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:4150: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:4151: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘avformat_new_stream’:
src/libavformat/utils.c:4264: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:4265: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:4289: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘avpriv_set_pts_info’:
src/libavformat/utils.c:4630: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘avformat_match_stream_specifier’:
src/libavformat/utils.c:4849: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:4864: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:4936: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘av_apply_bitstream_filters’:
src/libavformat/utils.c:5259: warning: ‘av_bitstream_filter_filter’ is deprecated (declared at src/libavcodec/avcodec.h:5932)
src/libavformat/utils.c: In function ‘avformat_transfer_internal_stream_timing_info’:
src/libavformat/utils.c:5405: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c:5406: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘av_stream_get_codec_timebase’:
src/libavformat/utils.c:5467: warning: ‘codec’ is deprecated (declared at src/libavformat/avformat.h:893)
src/libavformat/utils.c: In function ‘try_decode_frame’:
src/libavformat/utils.c:2951: warning: ‘skip_frame’ may be used uninitialized in this function
src/libavcodec/mips/blockdsp_init_mips.c:24:5: warning: "HAVE_MSA" is not defined
src/libavcodec/mips/blockdsp_init_mips.c:35:5: warning: "HAVE_MMI" is not defined
src/libavcodec/mips/blockdsp_init_mips.c:48:5: warning: "HAVE_MSA" is not defined
src/libavcodec/mips/blockdsp_init_mips.c:51:5: warning: "HAVE_MMI" is not defined
src/libavcodec/mips/blockdsp_init_mips.c:46: error: expected ‘)’ before ‘*’ token
src/libavcodec/mips/idctdsp_init_mips.c:24:5: warning: "HAVE_MSA" is not defined
src/libavcodec/mips/idctdsp_init_mips.c:44:5: warning: "HAVE_MMI" is not defined
src/libavcodec/mips/idctdsp_init_mips.c:65:5: warning: "HAVE_MSA" is not defined
src/libavcodec/mips/idctdsp_init_mips.c:68:5: warning: "HAVE_MMI" is not defined
In file included from src/libavcodec/mips/idctdsp_init_mips.c:23:
src/libavcodec/mips/idctdsp_mips.h:29: error: expected ‘;’, ‘,’ or ‘)’ before ‘pixels’
src/libavcodec/mips/idctdsp_mips.h:32: error: expected ‘;’, ‘,’ or ‘)’ before ‘pixels’
src/libavcodec/mips/idctdsp_mips.h:35: error: expected ‘;’, ‘,’ or ‘)’ before ‘pixels’
src/libavcodec/mips/idctdsp_mips.h:45: error: expected ‘;’, ‘,’ or ‘)’ before ‘pixels’
src/libavcodec/mips/idctdsp_mips.h:47: error: expected ‘;’, ‘,’ or ‘)’ before ‘pixels’
src/libavcodec/mips/idctdsp_mips.h:49: error: expected ‘;’, ‘,’ or ‘)’ before ‘pixels’
src/libavcodec/mips/idctdsp_init_mips.c:62: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘void’
src/libavcodec/mips/pixblockdsp_init_mips.c:24:5: warning: "HAVE_MSA" is not defined
src/libavcodec/mips/pixblockdsp_init_mips.c:48:5: warning: "HAVE_MMI" is not defined
src/libavcodec/mips/pixblockdsp_init_mips.c:63:5: warning: "HAVE_MSA" is not defined
src/libavcodec/mips/pixblockdsp_init_mips.c:66:5: warning: "HAVE_MMI" is not defined
In file included from src/libavcodec/mips/pixblockdsp_init_mips.c:23:
src/libavcodec/mips/pixblockdsp_mips.h:28: error: expected ‘;’, ‘,’ or ‘)’ before ‘block’
src/libavcodec/mips/pixblockdsp_mips.h:35: error: expected ‘;’, ‘,’ or ‘)’ before ‘block’
src/libavcodec/mips/pixblockdsp_mips.h:37: error: expected ‘;’, ‘,’ or ‘)’ before ‘block’
src/libavcodec/mips/pixblockdsp_init_mips.c:60: error: expected ‘)’ before ‘*’ token
src/libavcodec/mips/qpeldsp_init_mips.c:23:5: warning: "HAVE_MSA" is not defined
src/libavcodec/mips/qpeldsp_init_mips.c:164:5: warning: "HAVE_MSA" is not defined
src/libavcodec/mips/qpeldsp_init_mips.c:162: error: expected ‘)’ before ‘*’ token
make: *** [libavcodec/mips/blockdsp_init_mips.o] Error 1
make: *** Waiting for unfinished jobs....
make: *** [libavcodec/mips/idctdsp_init_mips.o] Error 1
make: *** [libavcodec/mips/pixblockdsp_init_mips.o] Error 1
make: *** [libavcodec/mips/qpeldsp_init_mips.o] Error 1



[...]

Patch hide | download patch | download mbox

diff --git a/libavcodec/mips/blockdsp_mips.h b/libavcodec/mips/blockdsp_mips.h
index 1742b123c3..1b3ad0f8bd 100644
--- a/libavcodec/mips/blockdsp_mips.h
+++ b/libavcodec/mips/blockdsp_mips.h
@@ -22,7 +22,8 @@ 
 #ifndef AVCODEC_MIPS_BLOCKDSP_MIPS_H
 #define AVCODEC_MIPS_BLOCKDSP_MIPS_H
 
-#include "../mpegvideo.h"
+#include <stddef.h>
+#include <stdint.h>
 
 void ff_fill_block16_msa(uint8_t *src, uint8_t val, ptrdiff_t stride, int height);
 void ff_fill_block8_msa(uint8_t *src, uint8_t val, ptrdiff_t stride, int height);
diff --git a/libavcodec/mips/idctdsp_mips.h b/libavcodec/mips/idctdsp_mips.h
index 19267e6705..6a78febacf 100644
--- a/libavcodec/mips/idctdsp_mips.h
+++ b/libavcodec/mips/idctdsp_mips.h
@@ -22,7 +22,8 @@ 
 #ifndef AVCODEC_MIPS_IDCTDSP_MIPS_H
 #define AVCODEC_MIPS_IDCTDSP_MIPS_H
 
-#include "../mpegvideo.h"
+#include <stddef.h>
+#include <stdint.h>
 
 void ff_put_pixels_clamped_msa(const int16_t *block,
                                uint8_t *av_restrict pixels,
diff --git a/libavcodec/mips/me_cmp_mips.h b/libavcodec/mips/me_cmp_mips.h
index e0d0f51af8..0de7429f48 100644
--- a/libavcodec/mips/me_cmp_mips.h
+++ b/libavcodec/mips/me_cmp_mips.h
@@ -21,7 +21,7 @@ 
 #ifndef AVCODEC_MIPS_ME_CMP_MIPS_H
 #define AVCODEC_MIPS_ME_CMP_MIPS_H
 
-#include "../mpegvideo.h"
+#include "libavcodec/mpegvideo.h"
 #include "libavcodec/bit_depth_template.c"
 
 int ff_hadamard8_diff8x8_msa(MpegEncContext *s, uint8_t *dst, uint8_t *src,
diff --git a/libavcodec/mips/pixblockdsp_mips.h b/libavcodec/mips/pixblockdsp_mips.h
index a12b1a6949..004e89e914 100644
--- a/libavcodec/mips/pixblockdsp_mips.h
+++ b/libavcodec/mips/pixblockdsp_mips.h
@@ -22,7 +22,8 @@ 
 #ifndef AVCODEC_MIPS_PIXBLOCKDSP_MIPS_H
 #define AVCODEC_MIPS_PIXBLOCKDSP_MIPS_H
 
-#include "../mpegvideo.h"
+#include <stddef.h>
+#include <stdint.h>
 
 void ff_diff_pixels_msa(int16_t *av_restrict block, const uint8_t *src1,
                         const uint8_t *src2, ptrdiff_t stride);
diff --git a/libavcodec/mips/qpeldsp_mips.h b/libavcodec/mips/qpeldsp_mips.h
index 704d221331..c7464aab11 100644
--- a/libavcodec/mips/qpeldsp_mips.h
+++ b/libavcodec/mips/qpeldsp_mips.h
@@ -21,7 +21,8 @@ 
 #ifndef AVCODEC_MIPS_QPELDSP_MIPS_H
 #define AVCODEC_MIPS_QPELDSP_MIPS_H
 
-#include "../mpegvideo.h"
+#include <stddef.h>
+#include <stdint.h>
 
 void ff_copy_8x8_msa(uint8_t *dst, const uint8_t *src, ptrdiff_t stride);
 void ff_copy_16x16_msa(uint8_t *dst, const uint8_t *src, ptrdiff_t stride);