annotate flvenc.c @ 1008:22538d21681f libavformat

fix a warning when DEBUG is defined
author bcoudurier
date Sat, 11 Mar 2006 18:43:10 +0000
parents edbe5c3717f9
children d89d7ef290da
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
1 /*
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
2 * FLV encoder.
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 The FFmpeg Project.
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
4 *
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
9 *
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
13 * Lesser General Public License for more details.
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
14 *
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 887
diff changeset
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
18 */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
19 #include "avformat.h"
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
20
445
c1f88671135b cleanup
michael
parents: 376
diff changeset
21 #undef NDEBUG
c1f88671135b cleanup
michael
parents: 376
diff changeset
22 #include <assert.h>
c1f88671135b cleanup
michael
parents: 376
diff changeset
23
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
24 typedef struct FLVContext {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
25 int hasAudio;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
26 int hasVideo;
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
27 int reserved;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
28 } FLVContext;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
29
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
30 static int get_audio_flags(AVCodecContext *enc){
684
d7c7f7bbdf55 proper handling of samplesize
alex
parents: 679
diff changeset
31 int flags = (enc->bits_per_sample == 16) ? 0x2 : 0x0;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
32
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
33 switch (enc->sample_rate) {
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
34 case 44100:
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
35 flags |= 0x0C;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
36 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
37 case 22050:
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
38 flags |= 0x08;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
39 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
40 case 11025:
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
41 flags |= 0x04;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
42 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
43 case 8000: //nellymoser only
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
44 case 5512: //not mp3
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
45 flags |= 0x00;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
46 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
47 default:
822
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 820
diff changeset
48 av_log(enc, AV_LOG_ERROR, "flv doesnt support that sample rate, choose from (44100, 22050, 11025)\n");
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
49 return -1;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
50 }
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
51
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
52 if (enc->channels > 1) {
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
53 flags |= 0x01;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
54 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
55
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
56 switch(enc->codec_id){
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
57 case CODEC_ID_MP3:
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
58 flags |= 0x20 | 0x2;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
59 break;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
60 case CODEC_ID_PCM_S8:
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
61 break;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
62 case CODEC_ID_PCM_S16BE:
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
63 flags |= 0x60 | 0x2;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
64 break;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
65 case CODEC_ID_PCM_S16LE:
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
66 flags |= 0x2;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
67 break;
872
441c59f95305 support transcoding adpcm
alex
parents: 822
diff changeset
68 case CODEC_ID_ADPCM_SWF:
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
69 flags |= 0x10;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
70 break;
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
71 case 0:
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
72 flags |= enc->codec_tag<<4;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
73 break;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
74 default:
822
2614d3c1f415 kill duplicated get/put_be24()
michael
parents: 820
diff changeset
75 av_log(enc, AV_LOG_ERROR, "codec not compatible with flv\n");
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
76 return -1;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
77 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
78
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
79 return flags;
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
80 }
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
81
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
82 static int flv_write_header(AVFormatContext *s)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
83 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
84 ByteIOContext *pb = &s->pb;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
85 FLVContext *flv = s->priv_data;
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
86 int i;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
87
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
88 flv->hasAudio = 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
89 flv->hasVideo = 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
90
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
91 put_tag(pb,"FLV");
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
92 put_byte(pb,1);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
93 put_byte(pb,0); // delayed write
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
94 put_be32(pb,9);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
95 put_be32(pb,0);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
96
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
97 for(i=0; i<s->nb_streams; i++){
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 759
diff changeset
98 AVCodecContext *enc = s->streams[i]->codec;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 446
diff changeset
99 av_set_pts_info(s->streams[i], 24, 1, 1000); /* 24 bit pts in ms */
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
100 if(enc->codec_tag == 5){
35447449b8b4 various fixes
michael
parents: 445
diff changeset
101 put_byte(pb,8); // message type
35447449b8b4 various fixes
michael
parents: 445
diff changeset
102 put_be24(pb,0); // include flags
35447449b8b4 various fixes
michael
parents: 445
diff changeset
103 put_be24(pb,0); // time stamp
35447449b8b4 various fixes
michael
parents: 445
diff changeset
104 put_be32(pb,0); // reserved
35447449b8b4 various fixes
michael
parents: 445
diff changeset
105 put_be32(pb,11); // size
35447449b8b4 various fixes
michael
parents: 445
diff changeset
106 flv->reserved=5;
35447449b8b4 various fixes
michael
parents: 445
diff changeset
107 }
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
108 if(enc->codec_type == CODEC_TYPE_AUDIO && get_audio_flags(enc)<0)
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
109 return -1;
446
35447449b8b4 various fixes
michael
parents: 445
diff changeset
110 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
111
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
112 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
113 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
114
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
115 static int flv_write_trailer(AVFormatContext *s)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
116 {
166
2271829b6f7e Building ffmpeg with gcc-2.95.3 encountered a problem due to C99 initialization fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
michaelni
parents: 164
diff changeset
117 int64_t file_size;
2271829b6f7e Building ffmpeg with gcc-2.95.3 encountered a problem due to C99 initialization fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
michaelni
parents: 164
diff changeset
118 int flags = 0;
2271829b6f7e Building ffmpeg with gcc-2.95.3 encountered a problem due to C99 initialization fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
michaelni
parents: 164
diff changeset
119
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
120 ByteIOContext *pb = &s->pb;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
121 FLVContext *flv = s->priv_data;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
122
166
2271829b6f7e Building ffmpeg with gcc-2.95.3 encountered a problem due to C99 initialization fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
michaelni
parents: 164
diff changeset
123 file_size = url_ftell(pb);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
124 flags |= flv->hasAudio ? 4 : 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
125 flags |= flv->hasVideo ? 1 : 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
126 url_fseek(pb, 4, SEEK_SET);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
127 put_byte(pb,flags);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
128 url_fseek(pb, file_size, SEEK_SET);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
129 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
130 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
131
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
132 static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
133 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
134 ByteIOContext *pb = &s->pb;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 759
diff changeset
135 AVCodecContext *enc = s->streams[pkt->stream_index]->codec;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
136 FLVContext *flv = s->priv_data;
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 462
diff changeset
137 int size= pkt->size;
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
138 int flags;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
139
445
c1f88671135b cleanup
michael
parents: 376
diff changeset
140 // av_log(s, AV_LOG_DEBUG, "type:%d pts: %lld size:%d\n", enc->codec_type, timestamp, size);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
141
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
142 if (enc->codec_type == CODEC_TYPE_VIDEO) {
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
143 put_byte(pb, 9);
7942c1aa0028 simplify
michael
parents: 468
diff changeset
144 flags = 2; // choose h263
7942c1aa0028 simplify
michael
parents: 468
diff changeset
145 flags |= pkt->flags & PKT_FLAG_KEY ? 0x10 : 0x20; // add keyframe indicator
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
146 flv->hasVideo = 1;
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
147 } else {
7942c1aa0028 simplify
michael
parents: 468
diff changeset
148 assert(enc->codec_type == CODEC_TYPE_AUDIO);
490
c0849ef998e7 assert(0) -> retunrn -1
michael
parents: 487
diff changeset
149 flags = get_audio_flags(enc);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
150
445
c1f88671135b cleanup
michael
parents: 376
diff changeset
151 assert(size);
c1f88671135b cleanup
michael
parents: 376
diff changeset
152
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
153 put_byte(pb, 8);
445
c1f88671135b cleanup
michael
parents: 376
diff changeset
154
c1f88671135b cleanup
michael
parents: 376
diff changeset
155 // We got audio! Make sure we set this to the global flags on closure
c1f88671135b cleanup
michael
parents: 376
diff changeset
156 flv->hasAudio = 1;
487
7942c1aa0028 simplify
michael
parents: 468
diff changeset
157 }
7942c1aa0028 simplify
michael
parents: 468
diff changeset
158
7942c1aa0028 simplify
michael
parents: 468
diff changeset
159 put_be24(pb,size+1); // include flags
7942c1aa0028 simplify
michael
parents: 468
diff changeset
160 put_be24(pb,pkt->pts);
7942c1aa0028 simplify
michael
parents: 468
diff changeset
161 put_be32(pb,flv->reserved);
7942c1aa0028 simplify
michael
parents: 468
diff changeset
162 put_byte(pb,flags);
7942c1aa0028 simplify
michael
parents: 468
diff changeset
163 put_buffer(pb, pkt->data, size);
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 490
diff changeset
164 put_be32(pb,size+1+11); // previous tag size
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 872
diff changeset
165
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
166 put_flush_packet(pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
167 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
168 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
169
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
170 static AVOutputFormat flv_oformat = {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
171 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
172 "flv format",
759
6418c3b8d8ec fix mimetype
michael
parents: 684
diff changeset
173 "video/x-flv",
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
174 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
175 sizeof(FLVContext),
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
176 #ifdef CONFIG_MP3LAME
232
eb90c0a5a1ba CODEC_ID_MP3LAME is obsolete
bellard
parents: 166
diff changeset
177 CODEC_ID_MP3,
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
178 #else // CONFIG_MP3LAME
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
179 CODEC_ID_NONE,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
180 #endif // CONFIG_MP3LAME
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
181 CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
182 flv_write_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
183 flv_write_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
184 flv_write_trailer,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
185 };
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
186
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
187 int flvenc_init(void)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
188 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
189 av_register_output_format(&flv_oformat);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
190 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
191 }