* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "raw.h"
+#include "pcm.h"
#include "riff.h"
typedef struct {
put_tag(pb, "MMMD");
put_be32(pb, 0);
- pos = start_tag(pb, "CNTI");
+ pos = ff_start_tag(pb, "CNTI");
put_byte(pb, 0); /* class */
put_byte(pb, 0); /* type */
put_byte(pb, 0); /* code type */
/* Will be filled on close */
put_buffer(pb, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16);
- mmf->awapos = start_tag(pb, "Awa\x01");
+ mmf->awapos = ff_start_tag(pb, "Awa\x01");
av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate);
if (!st)
return AVERROR(ENOMEM);
- st->codec->codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_ADPCM_YAMAHA;
st->codec->sample_rate = rate;
st->codec->channels = 1;
#if CONFIG_MMF_DEMUXER
AVInputFormat mmf_demuxer = {
"mmf",
- NULL_IF_CONFIG_SMALL("mmf format"),
+ NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
sizeof(MMFContext),
mmf_probe,
mmf_read_header,
#if CONFIG_MMF_MUXER
AVOutputFormat mmf_muxer = {
"mmf",
- NULL_IF_CONFIG_SMALL("mmf format"),
+ NULL_IF_CONFIG_SMALL("Yamaha SMAF"),
"application/vnd.smaf",
"mmf",
sizeof(MMFContext),