summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/mpeg12.c11
-rw-r--r--libavcodec/mpeg12.h2
2 files changed, 10 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 44a1d987cf..c649948fab 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -320,7 +320,7 @@ static int mpeg_decode_mb(MpegEncContext *s,
}
} else {
for(i=0;i<6;i++) {
- if (ff_mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
+ if (mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
return -1;
}
}
@@ -605,7 +605,7 @@ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred)
return val;
}
-inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
+static inline int mpeg1_decode_block_intra(MpegEncContext *s,
DCTELEM *block,
int n)
{
@@ -678,6 +678,13 @@ inline int ff_mpeg1_decode_block_intra(MpegEncContext *s,
return 0;
}
+int ff_mpeg1_decode_block_intra(MpegEncContext *s,
+ DCTELEM *block,
+ int n)
+{
+ return mpeg1_decode_block_intra(s, block, n);
+}
+
static inline int mpeg1_decode_block_inter(MpegEncContext *s,
DCTELEM *block,
int n)
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index dbbe8e43ec..30bb675d35 100644
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -56,6 +56,6 @@ static inline int decode_dc(GetBitContext *gb, int component)
return diff;
}
-extern inline int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
+extern int ff_mpeg1_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
#endif /* AVCODEC_MPEG12_H */