[FFmpeg-cvslog] avformat/mov.c: Use %d to print an enum, not PRIu8
ffmpeg | branch: master | Chris Watkins | Tue Apr 21 14:14:19 2015 -0700| [0703c44692d1ebd7c530c6f46beae8e4ecafaaa3] | committer: Michael Niedermayer avformat/mov.c: Use %d to print an enum, not PRIu8 Using the PRIu8 format specifier to print an enum value causes a compiler warning, so use %d instead. Fixes ticket #4467. Signed-off-by: Chris Watkins Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0703c44692d1ebd7c530c6f46beae8e4ecafaaa3 --- libavformat/mov.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 1af8fb6..0601830 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1230,7 +1230,7 @@ static int mov_read_aclr(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c, AV_LOG_WARNING, "ignored unknown aclr value (%d)\n", range_value); break; } -av_dlog(c, "color_range: %"PRIu8"\n", codec->color_range); +av_dlog(c, "color_range: %d\n", codec->color_range); } else { /* For some reason the whole atom was not added to the extradata */ av_log(c, AV_LOG_ERROR, "aclr not decoded - incomplete atom\n"); ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Put a space between string literals and macros.
ffmpeg | branch: master | Chris Watkins | Tue Jul 7 10:40:27 2015 -0700| [55e29ceec84aa498122576c1ae8a0fa1fab0b41e] | committer: Michael Niedermayer Put a space between string literals and macros. When compiling libavutil/internal.h as C++11, clang warns that a space is required between a string literal and an identifier. Put spaces in concatenations of string literals and EXTERN_PREFIX. Signed-off-by: Chris Watkins Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55e29ceec84aa498122576c1ae8a0fa1fab0b41e --- libavutil/internal.h |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/internal.h b/libavutil/internal.h index 8817ec3..859b919 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -238,8 +238,8 @@ void avpriv_request_sample(void *avc, #if HAVE_LIBC_MSVCRT #include #if defined(_VC_CRT_MAJOR_VERSION) && _VC_CRT_MAJOR_VERSION < 14 -#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod") -#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf") +#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_strtod") +#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_snprintf") #endif #define avpriv_open ff_open ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] oggparsedirac: check return value of init_get_bits
ffmpeg | branch: master | Chris Watkins | Tue Jul 7 10:23:44 2015 -0700| [4f5c2e651a95b950f6a3fb36f2342cbc32515f17] | committer: Michael Niedermayer oggparsedirac: check return value of init_get_bits If init_get_bits fails the GetBitContext is invalid and must not be used. Check the return value in dirac_header and propogate the error. Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f5c2e651a95b950f6a3fb36f2342cbc32515f17 --- libavformat/oggparsedirac.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c index 10fb07e..ab40f96 100644 --- a/libavformat/oggparsedirac.c +++ b/libavformat/oggparsedirac.c @@ -31,14 +31,19 @@ static int dirac_header(AVFormatContext *s, int idx) AVStream *st = s->streams[idx]; dirac_source_params source; GetBitContext gb; +int ret; // already parsed the header if (st->codec->codec_id == AV_CODEC_ID_DIRAC) return 0; -init_get_bits(&gb, os->buf + os->pstart + 13, (os->psize - 13) * 8); -if (avpriv_dirac_parse_sequence_header(st->codec, &gb, &source) < 0) -return -1; +ret = init_get_bits8(&gb, os->buf + os->pstart + 13, (os->psize - 13)); +if (ret < 0) +return ret; + +ret = avpriv_dirac_parse_sequence_header(st->codec, &gb, &source); +if (ret < 0) +return ret; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = AV_CODEC_ID_DIRAC; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Put a space between string literals and macros.
ffmpeg | branch: release/2.7 | Chris Watkins | Tue Jul 7 10:40:27 2015 -0700| [151554e1eb86404fd973dbcf888c50d2d5a51ff5] | committer: Michael Niedermayer Put a space between string literals and macros. When compiling libavutil/internal.h as C++11, clang warns that a space is required between a string literal and an identifier. Put spaces in concatenations of string literals and EXTERN_PREFIX. Signed-off-by: Chris Watkins Signed-off-by: Michael Niedermayer (cherry picked from commit 55e29ceec84aa498122576c1ae8a0fa1fab0b41e) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=151554e1eb86404fd973dbcf888c50d2d5a51ff5 --- libavutil/internal.h |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/internal.h b/libavutil/internal.h index 8817ec3..859b919 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -238,8 +238,8 @@ void avpriv_request_sample(void *avc, #if HAVE_LIBC_MSVCRT #include #if defined(_VC_CRT_MAJOR_VERSION) && _VC_CRT_MAJOR_VERSION < 14 -#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod") -#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf") +#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_strtod") +#pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_snprintf") #endif #define avpriv_open ff_open ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] oggparsedirac: check return value of init_get_bits
ffmpeg | branch: release/2.7 | Chris Watkins | Tue Jul 7 10:23:44 2015 -0700| [2a6f2cd8486fb5fbe4f1d2fa97c272bd4a7b34fb] | committer: Michael Niedermayer oggparsedirac: check return value of init_get_bits If init_get_bits fails the GetBitContext is invalid and must not be used. Check the return value in dirac_header and propogate the error. Signed-off-by: Michael Niedermayer (cherry picked from commit 4f5c2e651a95b950f6a3fb36f2342cbc32515f17) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a6f2cd8486fb5fbe4f1d2fa97c272bd4a7b34fb --- libavformat/oggparsedirac.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c index 10fb07e..ab40f96 100644 --- a/libavformat/oggparsedirac.c +++ b/libavformat/oggparsedirac.c @@ -31,14 +31,19 @@ static int dirac_header(AVFormatContext *s, int idx) AVStream *st = s->streams[idx]; dirac_source_params source; GetBitContext gb; +int ret; // already parsed the header if (st->codec->codec_id == AV_CODEC_ID_DIRAC) return 0; -init_get_bits(&gb, os->buf + os->pstart + 13, (os->psize - 13) * 8); -if (avpriv_dirac_parse_sequence_header(st->codec, &gb, &source) < 0) -return -1; +ret = init_get_bits8(&gb, os->buf + os->pstart + 13, (os->psize - 13)); +if (ret < 0) +return ret; + +ret = avpriv_dirac_parse_sequence_header(st->codec, &gb, &source); +if (ret < 0) +return ret; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = AV_CODEC_ID_DIRAC; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] oggparsedirac: check return value of init_get_bits
ffmpeg | branch: release/2.6 | Chris Watkins | Tue Jul 7 10:23:44 2015 -0700| [77f5302465ca7d9a1d4744cae22f510116d5b2a8] | committer: Michael Niedermayer oggparsedirac: check return value of init_get_bits If init_get_bits fails the GetBitContext is invalid and must not be used. Check the return value in dirac_header and propogate the error. Signed-off-by: Michael Niedermayer (cherry picked from commit 4f5c2e651a95b950f6a3fb36f2342cbc32515f17) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77f5302465ca7d9a1d4744cae22f510116d5b2a8 --- libavformat/oggparsedirac.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c index 10fb07e..ab40f96 100644 --- a/libavformat/oggparsedirac.c +++ b/libavformat/oggparsedirac.c @@ -31,14 +31,19 @@ static int dirac_header(AVFormatContext *s, int idx) AVStream *st = s->streams[idx]; dirac_source_params source; GetBitContext gb; +int ret; // already parsed the header if (st->codec->codec_id == AV_CODEC_ID_DIRAC) return 0; -init_get_bits(&gb, os->buf + os->pstart + 13, (os->psize - 13) * 8); -if (avpriv_dirac_parse_sequence_header(st->codec, &gb, &source) < 0) -return -1; +ret = init_get_bits8(&gb, os->buf + os->pstart + 13, (os->psize - 13)); +if (ret < 0) +return ret; + +ret = avpriv_dirac_parse_sequence_header(st->codec, &gb, &source); +if (ret < 0) +return ret; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = AV_CODEC_ID_DIRAC; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] oggparsedirac: check return value of init_get_bits
ffmpeg | branch: release/2.5 | Chris Watkins | Tue Jul 7 10:23:44 2015 -0700| [4f4ff23ccb88a6e815b9e8cbb95133491f1fb28c] | committer: Michael Niedermayer oggparsedirac: check return value of init_get_bits If init_get_bits fails the GetBitContext is invalid and must not be used. Check the return value in dirac_header and propogate the error. Signed-off-by: Michael Niedermayer (cherry picked from commit 4f5c2e651a95b950f6a3fb36f2342cbc32515f17) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f4ff23ccb88a6e815b9e8cbb95133491f1fb28c --- libavformat/oggparsedirac.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c index 10fb07e..ab40f96 100644 --- a/libavformat/oggparsedirac.c +++ b/libavformat/oggparsedirac.c @@ -31,14 +31,19 @@ static int dirac_header(AVFormatContext *s, int idx) AVStream *st = s->streams[idx]; dirac_source_params source; GetBitContext gb; +int ret; // already parsed the header if (st->codec->codec_id == AV_CODEC_ID_DIRAC) return 0; -init_get_bits(&gb, os->buf + os->pstart + 13, (os->psize - 13) * 8); -if (avpriv_dirac_parse_sequence_header(st->codec, &gb, &source) < 0) -return -1; +ret = init_get_bits8(&gb, os->buf + os->pstart + 13, (os->psize - 13)); +if (ret < 0) +return ret; + +ret = avpriv_dirac_parse_sequence_header(st->codec, &gb, &source); +if (ret < 0) +return ret; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = AV_CODEC_ID_DIRAC; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] oggparsedirac: check return value of init_get_bits
ffmpeg | branch: release/2.4 | Chris Watkins | Tue Jul 7 10:23:44 2015 -0700| [3fb241210af6000ec16aed5e1b445a6b12a367a7] | committer: Michael Niedermayer oggparsedirac: check return value of init_get_bits If init_get_bits fails the GetBitContext is invalid and must not be used. Check the return value in dirac_header and propogate the error. Signed-off-by: Michael Niedermayer (cherry picked from commit 4f5c2e651a95b950f6a3fb36f2342cbc32515f17) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3fb241210af6000ec16aed5e1b445a6b12a367a7 --- libavformat/oggparsedirac.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c index 73bc495..26d42f3 100644 --- a/libavformat/oggparsedirac.c +++ b/libavformat/oggparsedirac.c @@ -31,14 +31,19 @@ static int dirac_header(AVFormatContext *s, int idx) AVStream *st = s->streams[idx]; dirac_source_params source; GetBitContext gb; +int ret; // already parsed the header if (st->codec->codec_id == AV_CODEC_ID_DIRAC) return 0; -init_get_bits(&gb, os->buf + os->pstart + 13, (os->psize - 13) * 8); -if (avpriv_dirac_parse_sequence_header(st->codec, &gb, &source) < 0) -return -1; +ret = init_get_bits8(&gb, os->buf + os->pstart + 13, (os->psize - 13)); +if (ret < 0) +return ret; + +ret = avpriv_dirac_parse_sequence_header(st->codec, &gb, &source); +if (ret < 0) +return ret; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = AV_CODEC_ID_DIRAC; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog