aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-24 23:44:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-24 23:44:45 +0100
commit99c76902cdc3f815d58ba16ccfc83e75acec1f4a (patch)
tree61fbd2218434bd105f185a6e5a78ce377f5269f0 /libavformat
parentd2a5c6f2104db563491be0d16b722a1f7bbe65e4 (diff)
parent88434f9725e7c9484dcbcf323566ae88a2904f32 (diff)
downloadffmpeg-99c76902cdc3f815d58ba16ccfc83e75acec1f4a.tar.gz
Merge commit '88434f9725e7c9484dcbcf323566ae88a2904f32'
* commit '88434f9725e7c9484dcbcf323566ae88a2904f32': rtpdec: Remove unnecessary inline attributes Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rtpdec_jpeg.c2
-rw-r--r--libavformat/rtpdec_mpa_robust.c2
-rw-r--r--libavformat/rtpdec_xiph.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c
index 447ea2f6be..255351087f 100644
--- a/libavformat/rtpdec_jpeg.c
+++ b/libavformat/rtpdec_jpeg.c
@@ -59,7 +59,7 @@ static const uint8_t default_quantizers[128] = {
99, 99, 99, 99, 99, 99, 99, 99
};
-static inline void free_frame(PayloadContext *jpeg)
+static void free_frame(PayloadContext *jpeg)
{
if (jpeg->frame) {
uint8_t *p;
diff --git a/libavformat/rtpdec_mpa_robust.c b/libavformat/rtpdec_mpa_robust.c
index 447a1abc32..cbdfb58f09 100644
--- a/libavformat/rtpdec_mpa_robust.c
+++ b/libavformat/rtpdec_mpa_robust.c
@@ -33,7 +33,7 @@ struct PayloadContext {
AVIOContext *fragment;
};
-static inline void free_fragment(PayloadContext *data)
+static void free_fragment(PayloadContext *data)
{
if (data->fragment) {
uint8_t *p;
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c
index 7c32cdb2a9..49a33d7391 100644
--- a/libavformat/rtpdec_xiph.c
+++ b/libavformat/rtpdec_xiph.c
@@ -49,7 +49,7 @@ struct PayloadContext {
int split_pkts;
};
-static inline void free_fragment(PayloadContext * data)
+static void free_fragment(PayloadContext * data)
{
if (data->fragment) {
uint8_t* p;