Revision 2d563d2f ffserver.c

View differences:

ffserver.c
1507 1507
                        break;
1508 1508
                }
1509 1509

  
1510
                if (wmpc) {
1511
                    if (modify_current_stream(wmpc, ratebuf)) {
1512
                        wmpc->switch_pending = 1;
1513
                    }
1514
                }
1510
                if (wmpc && modify_current_stream(wmpc, ratebuf))
1511
                    wmpc->switch_pending = 1;
1515 1512
            }
1516 1513

  
1517 1514
            snprintf(msg, sizeof(msg), "POST command not handled");
......
1840 1837
        bitrate = 0;
1841 1838
        if (c1->stream) {
1842 1839
            for (j = 0; j < c1->stream->nb_streams; j++) {
1843
                if (!c1->stream->feed) {
1840
                if (!c1->stream->feed)
1844 1841
                    bitrate += c1->stream->streams[j]->codec->bit_rate;
1845
                } else {
1846
                    if (c1->feed_streams[j] >= 0) {
1847
                        bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate;
1848
                    }
1849
                }
1842
                else if (c1->feed_streams[j] >= 0)
1843
                    bitrate += c1->stream->feed->streams[c1->feed_streams[j]]->codec->bit_rate;
1850 1844
            }
1851 1845
        }
1852 1846

  

Also available in: Unified diff