Mercurial > libavformat.hg
comparison matroskaenc.c @ 3687:494a55f131f3 libavformat
matroska: expand useless define for MS compat codec id strings
| author | aurel |
|---|---|
| date | Tue, 05 Aug 2008 00:42:49 +0000 |
| parents | c0955bfc27be |
| children | e8f67b6063c3 |
comparison
equal
deleted
inserted
replaced
| 3686:03df0b5927ff | 3687:494a55f131f3 |
|---|---|
| 585 | 585 |
| 586 if (qt_id) | 586 if (qt_id) |
| 587 put_ebml_string(pb, MATROSKA_ID_CODECID, "V_QUICKTIME"); | 587 put_ebml_string(pb, MATROSKA_ID_CODECID, "V_QUICKTIME"); |
| 588 else if (!native_id) | 588 else if (!native_id) |
| 589 // if there is no mkv-specific codec ID, use VFW mode | 589 // if there is no mkv-specific codec ID, use VFW mode |
| 590 put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC); | 590 put_ebml_string(pb, MATROSKA_ID_CODECID, "V_MS/VFW/FOURCC"); |
| 591 | 591 |
| 592 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0); | 592 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0); |
| 593 // XXX: interlace flag? | 593 // XXX: interlace flag? |
| 594 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width); | 594 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width); |
| 595 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, codec->height); | 595 put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, codec->height); |
| 605 case CODEC_TYPE_AUDIO: | 605 case CODEC_TYPE_AUDIO: |
| 606 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO); | 606 put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO); |
| 607 | 607 |
| 608 if (!native_id) | 608 if (!native_id) |
| 609 // no mkv-specific ID, use ACM mode | 609 // no mkv-specific ID, use ACM mode |
| 610 put_ebml_string(pb, MATROSKA_ID_CODECID, MATROSKA_CODEC_ID_AUDIO_ACM); | 610 put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM"); |
| 611 | 611 |
| 612 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 0); | 612 subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 0); |
| 613 put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , codec->channels); | 613 put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , codec->channels); |
| 614 put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, sample_rate); | 614 put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, sample_rate); |
| 615 if (output_sample_rate) | 615 if (output_sample_rate) |