summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-10-26 17:59:50 +0100
committerMans Rullgard <mans@mansr.com>2012-10-27 18:26:28 +0100
commit4cbae57cef65df8705b77cf882372f835a42d842 (patch)
tree7ff24c9486fa3b5154b2aacf3e05ada97465c42b
parent4cd217c065e948a9cec38fef9c544d3c26ff8f37 (diff)
downloadffmpeg-streaming-4cbae57cef65df8705b77cf882372f835a42d842.zip
ffmpeg-streaming-4cbae57cef65df8705b77cf882372f835a42d842.tar.gz
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@mansr.com>
-rw-r--r--libavformat/assdec.c5
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;
OpenPOWER on IntegriCloud