mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
use http_log now that logfile is setup
Originally committed as revision 13975 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
f10d55ed88
commit
80b616fca3
20
ffserver.c
20
ffserver.c
@ -3443,7 +3443,7 @@ static void build_feed_streams(void)
|
||||
|
||||
if (sf->index != ss->index ||
|
||||
sf->id != ss->id) {
|
||||
printf("Index & Id do not match for stream %d (%s)\n",
|
||||
http_log("Index & Id do not match for stream %d (%s)\n",
|
||||
i, feed->feed_filename);
|
||||
matches = 0;
|
||||
} else {
|
||||
@ -3454,28 +3454,28 @@ static void build_feed_streams(void)
|
||||
#define CHECK_CODEC(x) (ccf->x != ccs->x)
|
||||
|
||||
if (CHECK_CODEC(codec) || CHECK_CODEC(codec_type)) {
|
||||
printf("Codecs do not match for stream %d\n", i);
|
||||
http_log("Codecs do not match for stream %d\n", i);
|
||||
matches = 0;
|
||||
} else if (CHECK_CODEC(bit_rate) || CHECK_CODEC(flags)) {
|
||||
printf("Codec bitrates do not match for stream %d\n", i);
|
||||
http_log("Codec bitrates do not match for stream %d\n", i);
|
||||
matches = 0;
|
||||
} else if (ccf->codec_type == CODEC_TYPE_VIDEO) {
|
||||
if (CHECK_CODEC(time_base.den) ||
|
||||
CHECK_CODEC(time_base.num) ||
|
||||
CHECK_CODEC(width) ||
|
||||
CHECK_CODEC(height)) {
|
||||
printf("Codec width, height and framerate do not match for stream %d\n", i);
|
||||
http_log("Codec width, height and framerate do not match for stream %d\n", i);
|
||||
matches = 0;
|
||||
}
|
||||
} else if (ccf->codec_type == CODEC_TYPE_AUDIO) {
|
||||
if (CHECK_CODEC(sample_rate) ||
|
||||
CHECK_CODEC(channels) ||
|
||||
CHECK_CODEC(frame_size)) {
|
||||
printf("Codec sample_rate, channels, frame_size do not match for stream %d\n", i);
|
||||
http_log("Codec sample_rate, channels, frame_size do not match for stream %d\n", i);
|
||||
matches = 0;
|
||||
}
|
||||
} else {
|
||||
printf("Unknown codec type\n");
|
||||
http_log("Unknown codec type\n");
|
||||
matches = 0;
|
||||
}
|
||||
}
|
||||
@ -3483,17 +3483,17 @@ static void build_feed_streams(void)
|
||||
break;
|
||||
}
|
||||
} else
|
||||
printf("Deleting feed file '%s' as stream counts differ (%d != %d)\n",
|
||||
http_log("Deleting feed file '%s' as stream counts differ (%d != %d)\n",
|
||||
feed->feed_filename, s->nb_streams, feed->nb_streams);
|
||||
|
||||
av_close_input_file(s);
|
||||
} else
|
||||
printf("Deleting feed file '%s' as it appears to be corrupt\n",
|
||||
http_log("Deleting feed file '%s' as it appears to be corrupt\n",
|
||||
feed->feed_filename);
|
||||
|
||||
if (!matches) {
|
||||
if (feed->readonly) {
|
||||
printf("Unable to delete feed file '%s' as it is marked readonly\n",
|
||||
http_log("Unable to delete feed file '%s' as it is marked readonly\n",
|
||||
feed->feed_filename);
|
||||
exit(1);
|
||||
}
|
||||
@ -3504,7 +3504,7 @@ static void build_feed_streams(void)
|
||||
AVFormatContext s1, *s = &s1;
|
||||
|
||||
if (feed->readonly) {
|
||||
printf("Unable to create feed file '%s' as it is marked readonly\n",
|
||||
http_log("Unable to create feed file '%s' as it is marked readonly\n",
|
||||
feed->feed_filename);
|
||||
exit(1);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user