diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 14:04:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 14:24:27 +0100 |
| commit | c73fcc8de3e314304819eed89216727a20e5e8a0 (patch) | |
| tree | badd72ed694f9712c3cfdc92bac9f88f97e6b106 /libavformat/assdec.c | |
| parent | 8943ad40146d322f5a5bf2bab790d117ec7a4c37 (diff) | |
| parent | 424b1e764263b1493de4c34365ef367ddae856db (diff) | |
| download | ffmpeg-c73fcc8de3e314304819eed89216727a20e5e8a0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
yuv4mpeg: reject unsupported codecs
nutenc: K&R formatting cosmetics
assdec: fix qsort() callback signature
configure: detect sparc64 automatically
vp8: fix memset() crossing array boundary
h264: fix invalid pointer arithmetic
amrwbdec: fix invalid pointer arithmetic
Conflicts:
libavformat/nutenc.c
libavformat/yuv4mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/assdec.c')
| -rw-r--r-- | libavformat/assdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/assdec.c b/libavformat/assdec.c index 835fd8a55d..d7a29bfdc6 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; |