Mercurial > libavformat.hg

comparison movenc.c @ 6012:8298cc054242 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make mov_write_packet non-static, add ff_ prefix
author mstorsjo
date Tue, 18 May 2010 19:40:17 +0000
parents 97fdefab56cd
children 332ad5f30c0e
comparison
equal deleted inserted replaced
6011:97fdefab56cd 6012:8298cc054242
1783 } 1783 }
1784 } 1784 }
1785 return 0; 1785 return 0;
1786 } 1786 }
1787 1787
1788 static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) 1788 int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
1789 { 1789 {
1790 MOVMuxContext *mov = s->priv_data; 1790 MOVMuxContext *mov = s->priv_data;
1791 ByteIOContext *pb = s->pb; 1791 ByteIOContext *pb = s->pb;
1792 MOVTrack *trk = &mov->tracks[pkt->stream_index]; 1792 MOVTrack *trk = &mov->tracks[pkt->stream_index];
1793 AVCodecContext *enc = trk->enc; 1793 AVCodecContext *enc = trk->enc;
1908 len = strlen(t->value); 1908 len = strlen(t->value);
1909 pkt.size = len+2; 1909 pkt.size = len+2;
1910 pkt.data = av_malloc(pkt.size); 1910 pkt.data = av_malloc(pkt.size);
1911 AV_WB16(pkt.data, len); 1911 AV_WB16(pkt.data, len);
1912 memcpy(pkt.data+2, t->value, len); 1912 memcpy(pkt.data+2, t->value, len);
1913 mov_write_packet(s, &pkt); 1913 ff_mov_write_packet(s, &pkt);
1914 av_freep(&pkt.data); 1914 av_freep(&pkt.data);
1915 } 1915 }
1916 } 1916 }
1917 } 1917 }
1918 1918
2082 "mov", 2082 "mov",
2083 sizeof(MOVMuxContext), 2083 sizeof(MOVMuxContext),
2084 CODEC_ID_AAC, 2084 CODEC_ID_AAC,
2085 CODEC_ID_MPEG4, 2085 CODEC_ID_MPEG4,
2086 mov_write_header, 2086 mov_write_header,
2087 mov_write_packet, 2087 ff_mov_write_packet,
2088 mov_write_trailer, 2088 mov_write_trailer,
2089 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, 2089 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
2090 .codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0}, 2090 .codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0},
2091 }; 2091 };
2092 #endif 2092 #endif
2098 "3gp", 2098 "3gp",
2099 sizeof(MOVMuxContext), 2099 sizeof(MOVMuxContext),
2100 CODEC_ID_AMR_NB, 2100 CODEC_ID_AMR_NB,
2101 CODEC_ID_H263, 2101 CODEC_ID_H263,
2102 mov_write_header, 2102 mov_write_header,
2103 mov_write_packet, 2103 ff_mov_write_packet,
2104 mov_write_trailer, 2104 mov_write_trailer,
2105 .flags = AVFMT_GLOBALHEADER, 2105 .flags = AVFMT_GLOBALHEADER,
2106 .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, 2106 .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0},
2107 }; 2107 };
2108 #endif 2108 #endif
2114 "mp4", 2114 "mp4",
2115 sizeof(MOVMuxContext), 2115 sizeof(MOVMuxContext),
2116 CODEC_ID_AAC, 2116 CODEC_ID_AAC,
2117 CODEC_ID_MPEG4, 2117 CODEC_ID_MPEG4,
2118 mov_write_header, 2118 mov_write_header,
2119 mov_write_packet, 2119 ff_mov_write_packet,
2120 mov_write_trailer, 2120 mov_write_trailer,
2121 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, 2121 .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
2122 .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, 2122 .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
2123 }; 2123 };
2124 #endif 2124 #endif
2130 "mp4,psp", 2130 "mp4,psp",
2131 sizeof(MOVMuxContext), 2131 sizeof(MOVMuxContext),
2132 CODEC_ID_AAC, 2132 CODEC_ID_AAC,
2133 CODEC_ID_MPEG4, 2133 CODEC_ID_MPEG4,
2134 mov_write_header, 2134 mov_write_header,
2135 mov_write_packet, 2135 ff_mov_write_packet,
2136 mov_write_trailer, 2136 mov_write_trailer,
2137 .flags = AVFMT_GLOBALHEADER, 2137 .flags = AVFMT_GLOBALHEADER,
2138 .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, 2138 .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
2139 }; 2139 };
2140 #endif 2140 #endif
2146 "3g2", 2146 "3g2",
2147 sizeof(MOVMuxContext), 2147 sizeof(MOVMuxContext),
2148 CODEC_ID_AMR_NB, 2148 CODEC_ID_AMR_NB,
2149 CODEC_ID_H263, 2149 CODEC_ID_H263,
2150 mov_write_header, 2150 mov_write_header,
2151 mov_write_packet, 2151 ff_mov_write_packet,
2152 mov_write_trailer, 2152 mov_write_trailer,
2153 .flags = AVFMT_GLOBALHEADER, 2153 .flags = AVFMT_GLOBALHEADER,
2154 .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, 2154 .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0},
2155 }; 2155 };
2156 #endif 2156 #endif
2162 "m4v,m4a", 2162 "m4v,m4a",
2163 sizeof(MOVMuxContext), 2163 sizeof(MOVMuxContext),
2164 CODEC_ID_AAC, 2164 CODEC_ID_AAC,
2165 CODEC_ID_H264, 2165 CODEC_ID_H264,
2166 mov_write_header, 2166 mov_write_header,
2167 mov_write_packet, 2167 ff_mov_write_packet,
2168 mov_write_trailer, 2168 mov_write_trailer,
2169 .flags = AVFMT_GLOBALHEADER, 2169 .flags = AVFMT_GLOBALHEADER,
2170 .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0}, 2170 .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0},
2171 }; 2171 };
2172 #endif 2172 #endif