Hi, On Wed, Jun 23, 2010 at 6:13 AM, Michael Niedermayer <michaelni@gmx.at> wrote:
On Tue, Jun 22, 2010 at 11:55:01PM -0700, Josh Allmann wrote:
Sent to luca, but not ffmpeg-soc... On 22 June 2010 23:52, Josh Allmann <joshua.allmann@gmail.com> wrote:
On 21 June 2010 14:28, Luca Barbato <lu_zero@gentoo.org> wrote:
On 21/06/2010 21:18, Josh Allmann wrote:
Okay, updated patches attached, with more forthcoming. (Ignore the numbering; that teaches me to do git rebase instead of git pull...)
0001 should use ff_ namespace probably.
Done
0029 not sure if hex_to_data might have other usages and thus should be put in the header as well.
Left as-is per Ronald's suggestion.
The rest seems ok
Three more patches attached which clean up the rest.
004 breaks receiving video (mpeg4 AND h264) if streamed in conjunction with AAC, but video seems to work OK in isolation. Which is weird because 004 should only touch the AAC codepath.
Been staring at this bug all day, so I'm just gonna turn in what I have, get some sleep, and hopefully dream up a fix.
Josh
internal.h | 13 +++++++++++++ rtsp.c | 35 +++++++++++------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) ebf55dc8176bc456ad4d776532dd1a78edba726f 0001-Move-skip_spaces-to-libavformat-internal.h.patch From 52d6caf62b08a7591ba5459a5966b7f7b0f8b23f Mon Sep 17 00:00:00 2001 From: Josh Allmann <joshua.allmann@gmail.com> Date: Sun, 20 Jun 2010 12:12:22 -0700 Subject: [PATCH 1/5] Move skip_spaces to libavformat/internal.h
--- libavformat/internal.h | 13 +++++++++++++ libavformat/rtsp.c | 35 +++++++++++------------------------ 2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/libavformat/internal.h b/libavformat/internal.h index 4489ffe..aaa71ac 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -174,4 +174,17 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt, AVFormatContext *src);
+#define SPACE_CHARS " \t\r\n" +/* we use memchr() instead of strchr() here because strchr() will return + * the terminating '\0' of SPACE_CHARS instead of NULL if c is '\0'. */ +#define redir_isspace(c) memchr(SPACE_CHARS, c, 4)
strspn ?
strspn() is interesting, does not appear to have the bug that strchr has (causing us to use memchr). I'm fine with switching. Ronald