[libav-commits] assdec: fix qsort() callback signature

Mans Rullgard git at libav.org
Sat Oct 27 19:43:22 CEST 2012


Module: libav
Branch: master
Commit: 4cbae57cef65df8705b77cf882372f835a42d842

Author:    Mans Rullgard <mans at mansr.com>
Committer: Mans Rullgard <mans at mansr.com>
Date:      Fri Oct 26 17:59:50 2012 +0100

assdec: fix qsort() callback signature

This changes the event_cmp() function to the correct signature,
avoiding an ugly cast.

Signed-off-by: Mans Rullgard <mans at mansr.com>

---

 libavformat/assdec.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 3d39845..0041ca4 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -68,8 +68,9 @@ static int64_t get_pts(const uint8_t *p)
     return sec*100+hsec;
 }
 
-static int event_cmp(uint8_t **a, uint8_t **b)
+static int event_cmp(const void *_a, const void *_b)
 {
+    const uint8_t *const *a = _a, *const *b = _b;
     return get_pts(*a) - get_pts(*b);
 }
 
@@ -131,7 +132,7 @@ static int read_header(AVFormatContext *s)
         p++;
     }
 
-    qsort(ass->event, ass->event_count, sizeof(*ass->event), (void*)event_cmp);
+    qsort(ass->event, ass->event_count, sizeof(*ass->event), event_cmp);
 
     return 0;
 



More information about the libav-commits mailing list