Revision af274fd1

View differences:

libavformat/ffmdec.c
477 477

  
478 478
AVInputFormat ffm_demuxer = {
479 479
    "ffm",
480
    NULL_IF_CONFIG_SMALL("ffm format"),
480
    NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
481 481
    sizeof(FFMContext),
482 482
    ffm_probe,
483 483
    ffm_read_header,
libavformat/ffmenc.c
237 237

  
238 238
AVOutputFormat ffm_muxer = {
239 239
    "ffm",
240
    NULL_IF_CONFIG_SMALL("ffm format"),
240
    NULL_IF_CONFIG_SMALL("FFM (FFserver live feed) format"),
241 241
    "",
242 242
    "ffm",
243 243
    sizeof(FFMContext),

Also available in: Unified diff