Mercurial > libavformat.hg
annotate rawenc.c @ 6452:c64b9d69a1ce libavformat
Fix crash when decoding DV in AVI introduced in r24579 (issue 2174).
Patch by Andrew Wason, rectalogic rectalogic com
| author | cehoyos |
|---|---|
| date | Thu, 02 Sep 2010 11:51:32 +0000 |
| parents | 4775a49a6045 |
| children | eb68008daac2 |
| rev | line source |
|---|---|
| 885 | 1 /* |
| 6448 | 2 * RAW muxers |
|
4251
77e0c7511d41
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
4206
diff
changeset
|
3 * Copyright (c) 2001 Fabrice Bellard |
|
868
c6b1dde68f3a
Ingenient MJPEG support, more at http://www.artificis.hu/files/texts/ingenient.txt
alex
parents:
858
diff
changeset
|
4 * Copyright (c) 2005 Alex Beregszaszi |
| 0 | 5 * |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
6 * This file is part of FFmpeg. |
|
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
7 * |
|
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
8 * FFmpeg is free software; you can redistribute it and/or |
| 0 | 9 * modify it under the terms of the GNU Lesser General Public |
| 10 * License as published by the Free Software Foundation; either | |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
11 * version 2.1 of the License, or (at your option) any later version. |
| 0 | 12 * |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
13 * FFmpeg is distributed in the hope that it will be useful, |
| 0 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 * Lesser General Public License for more details. | |
| 17 * | |
| 18 * You should have received a copy of the GNU Lesser General Public | |
|
1358
0899bfe4105c
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
1245
diff
changeset
|
19 * License along with FFmpeg; if not, write to the Free Software |
|
896
edbe5c3717f9
Update licensing information: The FSF changed postal address.
diego
parents:
887
diff
changeset
|
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 21 */ |
| 3286 | 22 |
| 0 | 23 #include "avformat.h" |
| 6448 | 24 #include "rawenc.h" |
| 0 | 25 |
| 6425 | 26 int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt) |
| 0 | 27 { |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
28 put_buffer(s->pb, pkt->data, pkt->size); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2545
diff
changeset
|
29 put_flush_packet(s->pb); |
| 0 | 30 return 0; |
| 31 } | |
| 32 | |
|
3545
2949f7da8931
Add a note to remind people to add new raw formats to the Makefile.
diego
parents:
3543
diff
changeset
|
33 /* Note: Do not forget to add new entries to the Makefile as well. */ |
|
2949f7da8931
Add a note to remind people to add new raw formats to the Makefile.
diego
parents:
3543
diff
changeset
|
34 |
| 4206 | 35 #if CONFIG_AC3_MUXER |
| 1167 | 36 AVOutputFormat ac3_muxer = { |
| 0 | 37 "ac3", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
38 NULL_IF_CONFIG_SMALL("raw AC-3"), |
| 885 | 39 "audio/x-ac3", |
| 0 | 40 "ac3", |
| 41 0, | |
| 42 CODEC_ID_AC3, | |
| 3289 | 43 CODEC_ID_NONE, |
| 2305 | 44 NULL, |
| 6425 | 45 ff_raw_write_packet, |
|
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
46 .flags= AVFMT_NOTIMESTAMPS, |
| 0 | 47 }; |
|
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
48 #endif |
| 0 | 49 |
| 4206 | 50 #if CONFIG_DIRAC_MUXER |
|
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
51 AVOutputFormat dirac_muxer = { |
|
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
52 "dirac", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
53 NULL_IF_CONFIG_SMALL("raw Dirac"), |
|
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
54 NULL, |
|
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
55 "drc", |
|
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
56 0, |
| 3289 | 57 CODEC_ID_NONE, |
|
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
58 CODEC_ID_DIRAC, |
|
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
59 NULL, |
| 6425 | 60 ff_raw_write_packet, |
|
3272
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
61 .flags= AVFMT_NOTIMESTAMPS, |
|
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
62 }; |
|
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
63 #endif |
|
07038dc492ab
Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
lu_zero
parents:
3269
diff
changeset
|
64 |
| 4206 | 65 #if CONFIG_DNXHD_MUXER |
| 4004 | 66 AVOutputFormat dnxhd_muxer = { |
| 67 "dnxhd", | |
| 68 NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), | |
| 69 NULL, | |
| 70 "dnxhd", | |
| 71 0, | |
| 72 CODEC_ID_NONE, | |
| 73 CODEC_ID_DNXHD, | |
| 74 NULL, | |
| 6425 | 75 ff_raw_write_packet, |
| 4004 | 76 .flags= AVFMT_NOTIMESTAMPS, |
| 77 }; | |
| 78 #endif | |
| 79 | |
| 4206 | 80 #if CONFIG_DTS_MUXER |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
81 AVOutputFormat dts_muxer = { |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
82 "dts", |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
83 NULL_IF_CONFIG_SMALL("raw DTS"), |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
84 "audio/x-dca", |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
85 "dts", |
| 931 | 86 0, |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
87 CODEC_ID_DTS, |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
88 CODEC_ID_NONE, |
| 931 | 89 NULL, |
| 6425 | 90 ff_raw_write_packet, |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
91 .flags= AVFMT_NOTIMESTAMPS, |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
92 }; |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
93 #endif |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
94 |
| 4206 | 95 #if CONFIG_EAC3_MUXER |
| 3862 | 96 AVOutputFormat eac3_muxer = { |
| 97 "eac3", | |
| 98 NULL_IF_CONFIG_SMALL("raw E-AC-3"), | |
| 99 "audio/x-eac3", | |
| 100 "eac3", | |
| 101 0, | |
| 102 CODEC_ID_EAC3, | |
| 103 CODEC_ID_NONE, | |
| 104 NULL, | |
| 6425 | 105 ff_raw_write_packet, |
| 3862 | 106 .flags= AVFMT_NOTIMESTAMPS, |
| 107 }; | |
| 108 #endif | |
| 109 | |
| 4206 | 110 #if CONFIG_H261_MUXER |
| 1167 | 111 AVOutputFormat h261_muxer = { |
|
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
112 "h261", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
113 NULL_IF_CONFIG_SMALL("raw H.261"), |
|
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
114 "video/x-h261", |
|
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
115 "h261", |
|
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
116 0, |
| 3289 | 117 CODEC_ID_NONE, |
|
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
118 CODEC_ID_H261, |
| 2305 | 119 NULL, |
| 6425 | 120 ff_raw_write_packet, |
|
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
121 .flags= AVFMT_NOTIMESTAMPS, |
|
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
122 }; |
|
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
123 #endif |
|
576
f701ba509d0c
H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
michael
parents:
567
diff
changeset
|
124 |
| 4206 | 125 #if CONFIG_H263_MUXER |
| 1167 | 126 AVOutputFormat h263_muxer = { |
| 0 | 127 "h263", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
128 NULL_IF_CONFIG_SMALL("raw H.263"), |
| 0 | 129 "video/x-h263", |
| 130 "h263", | |
| 131 0, | |
| 3289 | 132 CODEC_ID_NONE, |
| 0 | 133 CODEC_ID_H263, |
| 2305 | 134 NULL, |
| 6425 | 135 ff_raw_write_packet, |
|
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
136 .flags= AVFMT_NOTIMESTAMPS, |
| 0 | 137 }; |
|
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
138 #endif |
| 0 | 139 |
| 4206 | 140 #if CONFIG_H264_MUXER |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
141 AVOutputFormat h264_muxer = { |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
142 "h264", |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
143 NULL_IF_CONFIG_SMALL("raw H.264 video format"), |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
144 NULL, |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
145 "h264", |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
146 0, |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
147 CODEC_ID_NONE, |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
148 CODEC_ID_H264, |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
149 NULL, |
| 6425 | 150 ff_raw_write_packet, |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
151 .flags= AVFMT_NOTIMESTAMPS, |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
152 }; |
|
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
153 #endif |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
154 |
|
6320
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
155 #if CONFIG_CAVSVIDEO_MUXER |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
156 AVOutputFormat cavsvideo_muxer = { |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
157 "cavsvideo", |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
158 NULL_IF_CONFIG_SMALL("raw Chinese AVS video"), |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
159 NULL, |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
160 "cavs", |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
161 0, |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
162 CODEC_ID_NONE, |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
163 CODEC_ID_CAVS, |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
164 NULL, |
| 6425 | 165 ff_raw_write_packet, |
|
6320
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
166 .flags= AVFMT_NOTIMESTAMPS, |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
167 }; |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
168 #endif |
|
c12a0b951902
add Chinese AVS encoding via external library libxavs
stefang
parents:
6308
diff
changeset
|
169 |
| 4206 | 170 #if CONFIG_M4V_MUXER |
| 1167 | 171 AVOutputFormat m4v_muxer = { |
| 0 | 172 "m4v", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3405
diff
changeset
|
173 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), |
| 0 | 174 NULL, |
| 175 "m4v", | |
| 176 0, | |
| 177 CODEC_ID_NONE, | |
| 178 CODEC_ID_MPEG4, | |
| 2305 | 179 NULL, |
| 6425 | 180 ff_raw_write_packet, |
|
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
181 .flags= AVFMT_NOTIMESTAMPS, |
| 0 | 182 }; |
|
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
183 #endif |
| 0 | 184 |
| 4206 | 185 #if CONFIG_MJPEG_MUXER |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
186 AVOutputFormat mjpeg_muxer = { |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
187 "mjpeg", |
| 4501 | 188 NULL_IF_CONFIG_SMALL("raw MJPEG video"), |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
189 "video/x-mjpeg", |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
190 "mjpg,mjpeg", |
| 100 | 191 0, |
| 192 CODEC_ID_NONE, | |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
193 CODEC_ID_MJPEG, |
| 2305 | 194 NULL, |
| 6425 | 195 ff_raw_write_packet, |
|
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
196 .flags= AVFMT_NOTIMESTAMPS, |
| 100 | 197 }; |
|
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
198 #endif |
| 100 | 199 |
| 4901 | 200 #if CONFIG_MLP_MUXER |
| 4899 | 201 AVOutputFormat mlp_muxer = { |
| 202 "mlp", | |
| 203 NULL_IF_CONFIG_SMALL("raw MLP"), | |
| 204 NULL, | |
| 205 "mlp", | |
| 206 0, | |
| 207 CODEC_ID_MLP, | |
| 208 CODEC_ID_NONE, | |
| 209 NULL, | |
| 6425 | 210 ff_raw_write_packet, |
| 4899 | 211 .flags= AVFMT_NOTIMESTAMPS, |
| 212 }; | |
| 213 #endif | |
| 214 | |
| 6308 | 215 #if CONFIG_SRT_MUXER |
| 216 AVOutputFormat srt_muxer = { | |
| 217 .name = "srt", | |
| 218 .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle format"), | |
| 219 .mime_type = "application/x-subrip", | |
| 220 .extensions = "srt", | |
| 6425 | 221 .write_packet = ff_raw_write_packet, |
| 6308 | 222 .flags = AVFMT_NOTIMESTAMPS, |
| 223 .subtitle_codec = CODEC_ID_SRT, | |
| 224 }; | |
| 225 #endif | |
| 226 | |
| 4751 | 227 #if CONFIG_TRUEHD_MUXER |
| 228 AVOutputFormat truehd_muxer = { | |
| 229 "truehd", | |
| 230 NULL_IF_CONFIG_SMALL("raw TrueHD"), | |
| 231 NULL, | |
| 232 "thd", | |
| 233 0, | |
| 234 CODEC_ID_TRUEHD, | |
| 235 CODEC_ID_NONE, | |
| 236 NULL, | |
| 6425 | 237 ff_raw_write_packet, |
| 4751 | 238 .flags= AVFMT_NOTIMESTAMPS, |
| 239 }; | |
| 240 #endif | |
| 241 | |
| 4206 | 242 #if CONFIG_MPEG1VIDEO_MUXER |
| 1167 | 243 AVOutputFormat mpeg1video_muxer = { |
| 0 | 244 "mpeg1video", |
| 4501 | 245 NULL_IF_CONFIG_SMALL("raw MPEG-1 video"), |
| 0 | 246 "video/x-mpeg", |
| 814 | 247 "mpg,mpeg,m1v", |
| 0 | 248 0, |
| 3289 | 249 CODEC_ID_NONE, |
| 0 | 250 CODEC_ID_MPEG1VIDEO, |
| 2305 | 251 NULL, |
| 6425 | 252 ff_raw_write_packet, |
|
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
253 .flags= AVFMT_NOTIMESTAMPS, |
| 0 | 254 }; |
|
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
255 #endif |
| 0 | 256 |
| 4206 | 257 #if CONFIG_MPEG2VIDEO_MUXER |
| 1167 | 258 AVOutputFormat mpeg2video_muxer = { |
|
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
259 "mpeg2video", |
| 4501 | 260 NULL_IF_CONFIG_SMALL("raw MPEG-2 video"), |
|
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
261 NULL, |
|
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
262 "m2v", |
|
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
263 0, |
| 3289 | 264 CODEC_ID_NONE, |
|
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
265 CODEC_ID_MPEG2VIDEO, |
| 2305 | 266 NULL, |
| 6425 | 267 ff_raw_write_packet, |
|
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
268 .flags= AVFMT_NOTIMESTAMPS, |
|
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
269 }; |
|
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
270 #endif |
|
637
76e36d97a27a
Patch for creating m2v files by (Fabrizio Gennari <fabrizio.ge tiscali it)
michael
parents:
576
diff
changeset
|
271 |
| 4206 | 272 #if CONFIG_RAWVIDEO_MUXER |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
273 AVOutputFormat rawvideo_muxer = { |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
274 "rawvideo", |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
275 NULL_IF_CONFIG_SMALL("raw video format"), |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
276 NULL, |
|
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
277 "yuv,rgb", |
| 0 | 278 0, |
| 3289 | 279 CODEC_ID_NONE, |
|
3546
45c3d2b2b2fb
Alphabetically order AVInputFormat/AVOutputFormat declarations.
diego
parents:
3545
diff
changeset
|
280 CODEC_ID_RAWVIDEO, |
| 2305 | 281 NULL, |
| 6425 | 282 ff_raw_write_packet, |
|
1245
e59b75051ded
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
michael
parents:
1169
diff
changeset
|
283 .flags= AVFMT_NOTIMESTAMPS, |
| 0 | 284 }; |
|
3726
514470f7afed
cosmetics: Remove redundant #endif comments that are very close to the #ifdef
diego
parents:
3725
diff
changeset
|
285 #endif |
