diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2011-02-16 16:53:08 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-18 21:52:26 +0300 |
| commit | 34c340d49f2e6ca5190f16ced82da32561a7bef2 (patch) | |
| tree | 3e0921941cf9d0868d5b3673c520375b0c85eddb /ffserver.c | |
| parent | 728d56e84f7257e75a0f3824ebb8e53c2444b09b (diff) | |
ffserver: set the sample aspect ratio
Hi.
It seems that ffserver sets sample_aspect_ratio to an invalid value and lavf
rejects it.
I am not sure what I am doing here, but the attached patch actually solves
something: using the following config:
CustomLog -
NoDaemon
RTSPPort 5454
<Stream test1-rtsp.mpg>
Format rtp
File "/tmp/test1-rtsp.mpg"
</Stream>
it allows a somewhat old ffplay (unaffected by the content-base issue I
spoke of in another thread) to play the stream.
Without it, ffserver logs this and closes the stream:
Wed Feb 16 14:52:14 2011 [rtp @ 0x1399de0]Aspect ratio mismatch between encoder and muxer layer
Regards,
--
Nicolas George
From 1b89c3c2164335060e87567b27deb0d354e0a814 Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Wed, 16 Feb 2011 14:44:31 +0100
Subject: [PATCH] ffserver: set the sample aspect ratio.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
(cherry picked from commit 6741f7c9be4913e084ad067571f3f29853ec5d5a)
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index cbf04aa4a5..58d4112352 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3487,7 +3487,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop fst->priv_data = av_mallocz(sizeof(FeedData)); fst->index = stream->nb_streams; av_set_pts_info(fst, 33, 1, 90000); - fst->sample_aspect_ratio = (AVRational){0,1}; + fst->sample_aspect_ratio = codec->sample_aspect_ratio; stream->streams[stream->nb_streams++] = fst; return fst; } |