1. ffmpeg
  2. Commit 99c76902cdc3f815d58ba16ccfc83e75acec1f4a
Browse code

Merge commit '88434f9725e7c9484dcbcf323566ae88a2904f32'

* commit '88434f9725e7c9484dcbcf323566ae88a2904f32':
rtpdec: Remove unnecessary inline attributes

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2015/02/25 07:44:41
Showing 3 changed files
libavformat/rtpdec_jpeg.c
History View file @ 99c7690
... ... 
@@ -59,7 +59,7 @@ static const uint8_t default_quantizers[128] = {
59 59 
     99,  99,  99,  99,  99,  99,  99,  99
60 60 
 };
61 61
62 
-static inline void free_frame(PayloadContext *jpeg)
62 
+static void free_frame(PayloadContext *jpeg)
63 63 
 {
64 64 
     if (jpeg->frame) {
65 65 
         uint8_t *p;
libavformat/rtpdec_mpa_robust.c
History View file @ 99c7690
... ... 
@@ -33,7 +33,7 @@ struct PayloadContext {
33 33 
     AVIOContext *fragment;
34 34 
 };
35 35
36 
-static inline void free_fragment(PayloadContext *data)
36 
+static void free_fragment(PayloadContext *data)
37 37 
 {
38 38 
     if (data->fragment) {
39 39 
         uint8_t *p;
libavformat/rtpdec_xiph.c
History View file @ 99c7690
... ... 
@@ -49,7 +49,7 @@ struct PayloadContext {
49 49 
     int split_pkts;
50 50 
 };
51 51
52 
-static inline void free_fragment(PayloadContext * data)
52 
+static void free_fragment(PayloadContext * data)
53 53 
 {
54 54 
     if (data->fragment) {
55 55 
         uint8_t* p;