Revision 44adbebe

View differences:

libavcodec/adpcm.c
1719 1719
    NULL,                                       \
1720 1720
    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, \
1721 1721
    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
1722
};
1722
}
1723 1723
#else
1724 1724
#define ADPCM_ENCODER(id,name,long_name_)
1725 1725
#endif
......
1736 1736
    NULL,                                       \
1737 1737
    adpcm_decode_frame,                         \
1738 1738
    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
1739
};
1739
}
1740 1740
#else
1741 1741
#define ADPCM_DECODER(id,name,long_name_)
1742 1742
#endif
1743 1743

  
1744 1744
#define ADPCM_CODEC(id,name,long_name_)         \
1745
    ADPCM_ENCODER(id,name,long_name_) ADPCM_DECODER(id,name,long_name_)
1745
    ADPCM_ENCODER(id,name,long_name_); ADPCM_DECODER(id,name,long_name_)
1746 1746

  
1747 1747
/* Note: Do not forget to add new entries to the Makefile as well. */
1748 1748
ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm, "ADPCM 4X Movie");
libavcodec/dpcm.c
309 309
    NULL,                                       \
310 310
    dpcm_decode_frame,                          \
311 311
    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
312
};
312
}
313 313

  
314 314
DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay");
315 315
DPCM_DECODER(CODEC_ID_ROQ_DPCM, roq_dpcm, "DPCM id RoQ");
libavcodec/pcm.c
482 482
    .close       = pcm_encode_close,            \
483 483
    .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \
484 484
    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
485
};
485
}
486 486
#else
487 487
#define PCM_ENCODER(id,sample_fmt_,name,long_name_)
488 488
#endif
......
498 498
    .decode         = pcm_decode_frame,         \
499 499
    .sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \
500 500
    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
501
};
501
}
502 502
#else
503 503
#define PCM_DECODER(id,sample_fmt_,name,long_name_)
504 504
#endif
505 505

  
506 506
#define PCM_CODEC(id, sample_fmt_, name, long_name_)         \
507
    PCM_ENCODER(id,sample_fmt_,name,long_name_) PCM_DECODER(id,sample_fmt_,name,long_name_)
507
    PCM_ENCODER(id,sample_fmt_,name,long_name_); PCM_DECODER(id,sample_fmt_,name,long_name_)
508 508

  
509 509
/* Note: Do not forget to add new entries to the Makefile as well. */
510 510
PCM_CODEC  (CODEC_ID_PCM_ALAW,  AV_SAMPLE_FMT_S16, pcm_alaw, "PCM A-law");
libavformat/rdt.c
559 559
    .open             = rdt_new_context, \
560 560
    .close            = rdt_free_context, \
561 561
    .parse_packet     = rdt_parse_packet \
562
};
562
}
563 563

  
564 564
RDT_HANDLER(live_video, "x-pn-multirate-realvideo-live", AVMEDIA_TYPE_VIDEO);
565 565
RDT_HANDLER(live_audio, "x-pn-multirate-realaudio-live", AVMEDIA_TYPE_AUDIO);
libavformat/rtpdec_asf.c
288 288
    .open             = asfrtp_new_context, \
289 289
    .close            = asfrtp_free_context, \
290 290
    .parse_packet     = asfrtp_parse_packet,   \
291
};
291
}
292 292

  
293 293
RTP_ASF_HANDLER(asf_pfv, "x-asf-pf",  AVMEDIA_TYPE_VIDEO);
294 294
RTP_ASF_HANDLER(asf_pfa, "x-asf-pf",  AVMEDIA_TYPE_AUDIO);
libavformat/rtpdec_qt.c
246 246
    .open             = qt_rtp_new,    \
247 247
    .close            = qt_rtp_free,   \
248 248
    .parse_packet     = qt_rtp_parse_packet, \
249
};
249
}
250 250

  
251 251
RTP_QT_HANDLER(qt,        vid, "X-QT",        AVMEDIA_TYPE_VIDEO);
252 252
RTP_QT_HANDLER(qt,        aud, "X-QT",        AVMEDIA_TYPE_AUDIO);

Also available in: Unified diff