diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 02:57:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 02:57:41 +0100 |
| commit | 797ef671dda9094640ade203a09dc59e9bf328a4 (patch) | |
| tree | 01f686f189f26f0dc745dc5a4d70d6983b18aafc /libavformat/ffmetadec.c | |
| parent | 5d6c5dd36c024784a9cd36391c3698c2f1f2d2ab (diff) | |
| parent | 98a7d560b4f835ba5b99b9974ee1a2c096198bea (diff) | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
matroskadec: set default duration for simple block
When building for MinGW32 disable strict ANSI compliancy.
ARM: fix ff_apply_window_int16_neon() prototype
configure: check for --as-needed support early
ARM: NEON optimised apply_window_int16()
ac3enc: NEON optimised shift functions
ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
mpeg12.c: fix slice threading for mpeg2 field picture mode.
ffmetadec.c: fix compiler warnings.
configure: Don't explicitly disable ffplay or in/outdevices on dos
configure: Remove the explicit disabling of ffserver
configure: Add fork as a dependency to ffserver
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmetadec.c')
| -rw-r--r-- | libavformat/ffmetadec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index cc7e1da48f..a8bffa09af 100644 --- a/libavformat/ffmetadec.c +++ b/libavformat/ffmetadec.c @@ -61,14 +61,14 @@ static AVChapter *read_chapter(AVFormatContext *s) if (sscanf(line, "TIMEBASE=%d/%d", &tb.num, &tb.den)) get_line(s->pb, line, sizeof(line)); - if (!sscanf(line, "START=%lld", &start)) { + if (!sscanf(line, "START=%"SCNd64, &start)) { av_log(s, AV_LOG_ERROR, "Expected chapter start timestamp, found %s.\n", line); start = (s->nb_chapters && s->chapters[s->nb_chapters - 1]->end != AV_NOPTS_VALUE) ? s->chapters[s->nb_chapters - 1]->end : 0; } else get_line(s->pb, line, sizeof(line)); - if (!sscanf(line, "END=%lld", &end)) { + if (!sscanf(line, "END=%"SCNd64, &end)) { av_log(s, AV_LOG_ERROR, "Expected chapter end timestamp, found %s.\n", line); end = AV_NOPTS_VALUE; } |