Mercurial > libavformat.hg

comparison asfenc.c @ 5058:33a244b7ca65 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add ff_ prefixes to exported symbols in libavformat/riff.h. patch by Daniel Verkamp, aniel drv nu
author diego
date Mon, 22 Jun 2009 23:09:34 +0000
parents 86dd0cab30d3
children 499c21a8e0c2
comparison
equal deleted inserted replaced
5057:c9bbf0a253a8 5058:33a244b7ca65
403 put_le16(pb, n + 1); /* stream number */ 403 put_le16(pb, n + 1); /* stream number */
404 put_le32(pb, 0); /* ??? */ 404 put_le32(pb, 0); /* ??? */
405 405
406 if (enc->codec_type == CODEC_TYPE_AUDIO) { 406 if (enc->codec_type == CODEC_TYPE_AUDIO) {
407 /* WAVEFORMATEX header */ 407 /* WAVEFORMATEX header */
408 int wavsize = put_wav_header(pb, enc); 408 int wavsize = ff_put_wav_header(pb, enc);
409 if ((enc->codec_id != CODEC_ID_MP3) && (enc->codec_id != CODEC_ID_MP2) && (enc->codec_id != CODEC_ID_ADPCM_IMA_WAV) && (enc->extradata_size==0)) { 409 if ((enc->codec_id != CODEC_ID_MP3) && (enc->codec_id != CODEC_ID_MP2) && (enc->codec_id != CODEC_ID_ADPCM_IMA_WAV) && (enc->extradata_size==0)) {
410 wavsize += 2; 410 wavsize += 2;
411 put_le16(pb, 0); 411 put_le16(pb, 0);
412 } 412 }
413 413
435 put_le32(pb, enc->height); 435 put_le32(pb, enc->height);
436 put_byte(pb, 2); /* ??? */ 436 put_byte(pb, 2); /* ??? */
437 put_le16(pb, 40 + enc->extradata_size); /* size */ 437 put_le16(pb, 40 + enc->extradata_size); /* size */
438 438
439 /* BITMAPINFOHEADER header */ 439 /* BITMAPINFOHEADER header */
440 put_bmp_header(pb, enc, codec_bmp_tags, 1); 440 ff_put_bmp_header(pb, enc, ff_codec_bmp_tags, 1);
441 } 441 }
442 end_header(pb, hpos); 442 end_header(pb, hpos);
443 } 443 }
444 444
445 /* media comments */ 445 /* media comments */
852 CODEC_ID_MSMPEG4V3, 852 CODEC_ID_MSMPEG4V3,
853 asf_write_header, 853 asf_write_header,
854 asf_write_packet, 854 asf_write_packet,
855 asf_write_trailer, 855 asf_write_trailer,
856 .flags = AVFMT_GLOBALHEADER, 856 .flags = AVFMT_GLOBALHEADER,
857 .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0}, 857 .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
858 .metadata_conv = ff_asf_metadata_conv, 858 .metadata_conv = ff_asf_metadata_conv,
859 }; 859 };
860 #endif 860 #endif
861 861
862 #if CONFIG_ASF_STREAM_MUXER 862 #if CONFIG_ASF_STREAM_MUXER
874 CODEC_ID_MSMPEG4V3, 874 CODEC_ID_MSMPEG4V3,
875 asf_write_stream_header, 875 asf_write_stream_header,
876 asf_write_packet, 876 asf_write_packet,
877 asf_write_trailer, 877 asf_write_trailer,
878 .flags = AVFMT_GLOBALHEADER, 878 .flags = AVFMT_GLOBALHEADER,
879 .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0}, 879 .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
880 .metadata_conv = ff_asf_metadata_conv, 880 .metadata_conv = ff_asf_metadata_conv,
881 }; 881 };
882 #endif //CONFIG_ASF_STREAM_MUXER 882 #endif //CONFIG_ASF_STREAM_MUXER