diff options
| author | Martin Storsjö <martin@martin.st> | 2010-05-24 20:24:39 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-05-24 20:24:39 +0000 |
| commit | 111c935980138f65a5562fd28837064e467c7e7e (patch) | |
| tree | a821e9a314566931a42abe131c72642d73a0bcc4 /ffserver.c | |
| parent | a5ba4cedf22b59f6a0b9b74256539f614b582e8d (diff) | |
| download | ffmpeg-streaming-111c935980138f65a5562fd28837064e467c7e7e.zip ffmpeg-streaming-111c935980138f65a5562fd28837064e467c7e7e.tar.gz | |
ffserver: Fix one of the codec parameter checks
This is probably what was originally intended; the codec pointers are all NULL.
Fix by Howard Chu, hyc at highlandsun dot com
Originally committed as revision 23295 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3697,7 +3697,7 @@ static void build_feed_streams(void) ccs = ss->codec; #define CHECK_CODEC(x) (ccf->x != ccs->x) - if (CHECK_CODEC(codec) || CHECK_CODEC(codec_type)) { + if (CHECK_CODEC(codec_id) || CHECK_CODEC(codec_type)) { http_log("Codecs do not match for stream %d\n", i); matches = 0; } else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) { |
