From e578f8f4680f7ad290de64270dc152fb1adb6e6a Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 10 Oct 2012 23:40:04 +0200 Subject: [PATCH 1/2] prepare 9_beta1 release --- Changelog | 3 +++ RELEASE | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 5948bbe976..b4b5294755 100644 --- a/Changelog +++ b/Changelog @@ -3,6 +3,9 @@ releases are sorted from youngest to oldest. version : + +version 9_beta1: + - XWD encoder and decoder - Support for fragmentation in the mov/mp4 muxer - ISMV (Smooth Streaming) muxer diff --git a/RELEASE b/RELEASE index aec258df73..437fe58a9e 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -0.8 +9_beta1 From 15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 11 Oct 2012 14:12:34 +0100 Subject: [PATCH 2/2] parseutils: fix const removal warning The const qualifier is still removed although it happens inside the strtol() function so no warning is generated. Fixes: libavutil/parseutils.c:110:11: warning: assignment discards qualifiers from pointer target type Signed-off-by: Mans Rullgard --- libavutil/parseutils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index b51f2e86ce..23fa80c01b 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -107,8 +107,7 @@ int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str) } } if (i == n) { - p = str; - width = strtol(p, &p, 10); + width = strtol(str, &p, 10); if (*p) p++; height = strtol(p, &p, 10);