← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty-proposed

« back to all changes in this revision

Viewing changes to libavformat/rawenc.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-10-22 23:24:08 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: package-import@ubuntu.com-20131022232408-b8tvvn4pyzri9mi3
Tags: 6:9.10-1ubuntu1
https://launchpad.net/bugs/1243235
https://launchpad.net/bugs/1180288
https://launchpad.net/bugs/1242802
* Build all -extra flavors from this source package, as libav got demoted
  from main to universe, cf LP: #1243235
* Simplify debian/rules to follow exactly the code that debian executes
* New upstream (LP: #1180288) fixes lots of security issues (LP: #1242802)
* Merge from unstable, remaining changes:
  - build-depend on libtiff5-dev rather than libtiff4-dev,
    avoids FTBFS caused by imlib
  - follow the regular debian codepaths

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/rawenc.c
38
38
    .long_name         = NULL_IF_CONFIG_SMALL("raw AC-3"),
39
39
    .mime_type         = "audio/x-ac3",
40
40
    .extensions        = "ac3",
41
 
    .audio_codec       = CODEC_ID_AC3,
42
 
    .video_codec       = CODEC_ID_NONE,
 
41
    .audio_codec       = AV_CODEC_ID_AC3,
 
42
    .video_codec       = AV_CODEC_ID_NONE,
43
43
    .write_packet      = ff_raw_write_packet,
44
 
    .flags= AVFMT_NOTIMESTAMPS,
 
44
    .flags             = AVFMT_NOTIMESTAMPS,
45
45
};
46
46
#endif
47
47
 
50
50
    .name              = "adx",
51
51
    .long_name         = NULL_IF_CONFIG_SMALL("CRI ADX"),
52
52
    .extensions        = "adx",
53
 
    .audio_codec       = CODEC_ID_ADPCM_ADX,
54
 
    .video_codec       = CODEC_ID_NONE,
 
53
    .audio_codec       = AV_CODEC_ID_ADPCM_ADX,
 
54
    .video_codec       = AV_CODEC_ID_NONE,
 
55
    .write_packet      = ff_raw_write_packet,
 
56
    .flags             = AVFMT_NOTIMESTAMPS,
 
57
};
 
58
#endif
 
59
 
 
60
#if CONFIG_CAVSVIDEO_MUXER
 
61
AVOutputFormat ff_cavsvideo_muxer = {
 
62
    .name              = "cavsvideo",
 
63
    .long_name         = NULL_IF_CONFIG_SMALL("raw Chinese AVS (Audio Video Standard) video"),
 
64
    .extensions        = "cavs",
 
65
    .audio_codec       = AV_CODEC_ID_NONE,
 
66
    .video_codec       = AV_CODEC_ID_CAVS,
55
67
    .write_packet      = ff_raw_write_packet,
56
68
    .flags             = AVFMT_NOTIMESTAMPS,
57
69
};
62
74
    .name              = "dirac",
63
75
    .long_name         = NULL_IF_CONFIG_SMALL("raw Dirac"),
64
76
    .extensions        = "drc",
65
 
    .audio_codec       = CODEC_ID_NONE,
66
 
    .video_codec       = CODEC_ID_DIRAC,
 
77
    .audio_codec       = AV_CODEC_ID_NONE,
 
78
    .video_codec       = AV_CODEC_ID_DIRAC,
67
79
    .write_packet      = ff_raw_write_packet,
68
 
    .flags= AVFMT_NOTIMESTAMPS,
 
80
    .flags             = AVFMT_NOTIMESTAMPS,
69
81
};
70
82
#endif
71
83
 
74
86
    .name              = "dnxhd",
75
87
    .long_name         = NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
76
88
    .extensions        = "dnxhd",
77
 
    .audio_codec       = CODEC_ID_NONE,
78
 
    .video_codec       = CODEC_ID_DNXHD,
 
89
    .audio_codec       = AV_CODEC_ID_NONE,
 
90
    .video_codec       = AV_CODEC_ID_DNXHD,
79
91
    .write_packet      = ff_raw_write_packet,
80
 
    .flags= AVFMT_NOTIMESTAMPS,
 
92
    .flags             = AVFMT_NOTIMESTAMPS,
81
93
};
82
94
#endif
83
95
 
87
99
    .long_name         = NULL_IF_CONFIG_SMALL("raw DTS"),
88
100
    .mime_type         = "audio/x-dca",
89
101
    .extensions        = "dts",
90
 
    .audio_codec       = CODEC_ID_DTS,
91
 
    .video_codec       = CODEC_ID_NONE,
 
102
    .audio_codec       = AV_CODEC_ID_DTS,
 
103
    .video_codec       = AV_CODEC_ID_NONE,
92
104
    .write_packet      = ff_raw_write_packet,
93
 
    .flags= AVFMT_NOTIMESTAMPS,
 
105
    .flags             = AVFMT_NOTIMESTAMPS,
94
106
};
95
107
#endif
96
108
 
100
112
    .long_name         = NULL_IF_CONFIG_SMALL("raw E-AC-3"),
101
113
    .mime_type         = "audio/x-eac3",
102
114
    .extensions        = "eac3",
103
 
    .audio_codec       = CODEC_ID_EAC3,
104
 
    .video_codec       = CODEC_ID_NONE,
 
115
    .audio_codec       = AV_CODEC_ID_EAC3,
 
116
    .video_codec       = AV_CODEC_ID_NONE,
105
117
    .write_packet      = ff_raw_write_packet,
106
 
    .flags= AVFMT_NOTIMESTAMPS,
 
118
    .flags             = AVFMT_NOTIMESTAMPS,
107
119
};
108
120
#endif
109
121
 
113
125
    .long_name         = NULL_IF_CONFIG_SMALL("raw G.722"),
114
126
    .mime_type         = "audio/G722",
115
127
    .extensions        = "g722",
116
 
    .audio_codec       = CODEC_ID_ADPCM_G722,
117
 
    .video_codec       = CODEC_ID_NONE,
 
128
    .audio_codec       = AV_CODEC_ID_ADPCM_G722,
 
129
    .video_codec       = AV_CODEC_ID_NONE,
118
130
    .write_packet      = ff_raw_write_packet,
119
 
    .flags= AVFMT_NOTIMESTAMPS,
 
131
    .flags             = AVFMT_NOTIMESTAMPS,
120
132
};
121
133
#endif
122
134
 
126
138
    .long_name         = NULL_IF_CONFIG_SMALL("raw H.261"),
127
139
    .mime_type         = "video/x-h261",
128
140
    .extensions        = "h261",
129
 
    .audio_codec       = CODEC_ID_NONE,
130
 
    .video_codec       = CODEC_ID_H261,
 
141
    .audio_codec       = AV_CODEC_ID_NONE,
 
142
    .video_codec       = AV_CODEC_ID_H261,
131
143
    .write_packet      = ff_raw_write_packet,
132
 
    .flags= AVFMT_NOTIMESTAMPS,
 
144
    .flags             = AVFMT_NOTIMESTAMPS,
133
145
};
134
146
#endif
135
147
 
139
151
    .long_name         = NULL_IF_CONFIG_SMALL("raw H.263"),
140
152
    .mime_type         = "video/x-h263",
141
153
    .extensions        = "h263",
142
 
    .audio_codec       = CODEC_ID_NONE,
143
 
    .video_codec       = CODEC_ID_H263,
 
154
    .audio_codec       = AV_CODEC_ID_NONE,
 
155
    .video_codec       = AV_CODEC_ID_H263,
144
156
    .write_packet      = ff_raw_write_packet,
145
 
    .flags= AVFMT_NOTIMESTAMPS,
 
157
    .flags             = AVFMT_NOTIMESTAMPS,
146
158
};
147
159
#endif
148
160
 
149
161
#if CONFIG_H264_MUXER
150
162
AVOutputFormat ff_h264_muxer = {
151
163
    .name              = "h264",
152
 
    .long_name         = NULL_IF_CONFIG_SMALL("raw H.264 video format"),
 
164
    .long_name         = NULL_IF_CONFIG_SMALL("raw H.264 video"),
153
165
    .extensions        = "h264",
154
 
    .audio_codec       = CODEC_ID_NONE,
155
 
    .video_codec       = CODEC_ID_H264,
156
 
    .write_packet      = ff_raw_write_packet,
157
 
    .flags= AVFMT_NOTIMESTAMPS,
158
 
};
159
 
#endif
160
 
 
161
 
#if CONFIG_CAVSVIDEO_MUXER
162
 
AVOutputFormat ff_cavsvideo_muxer = {
163
 
    .name              = "cavsvideo",
164
 
    .long_name         = NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),
165
 
    .extensions        = "cavs",
166
 
    .audio_codec       = CODEC_ID_NONE,
167
 
    .video_codec       = CODEC_ID_CAVS,
168
 
    .write_packet      = ff_raw_write_packet,
169
 
    .flags= AVFMT_NOTIMESTAMPS,
 
166
    .audio_codec       = AV_CODEC_ID_NONE,
 
167
    .video_codec       = AV_CODEC_ID_H264,
 
168
    .write_packet      = ff_raw_write_packet,
 
169
    .flags             = AVFMT_NOTIMESTAMPS,
170
170
};
171
171
#endif
172
172
 
173
173
#if CONFIG_M4V_MUXER
174
174
AVOutputFormat ff_m4v_muxer = {
175
175
    .name              = "m4v",
176
 
    .long_name         = NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
 
176
    .long_name         = NULL_IF_CONFIG_SMALL("raw MPEG-4 video"),
177
177
    .extensions        = "m4v",
178
 
    .audio_codec       = CODEC_ID_NONE,
179
 
    .video_codec       = CODEC_ID_MPEG4,
 
178
    .audio_codec       = AV_CODEC_ID_NONE,
 
179
    .video_codec       = AV_CODEC_ID_MPEG4,
180
180
    .write_packet      = ff_raw_write_packet,
181
 
    .flags= AVFMT_NOTIMESTAMPS,
 
181
    .flags             = AVFMT_NOTIMESTAMPS,
182
182
};
183
183
#endif
184
184
 
188
188
    .long_name         = NULL_IF_CONFIG_SMALL("raw MJPEG video"),
189
189
    .mime_type         = "video/x-mjpeg",
190
190
    .extensions        = "mjpg,mjpeg",
191
 
    .audio_codec       = CODEC_ID_NONE,
192
 
    .video_codec       = CODEC_ID_MJPEG,
 
191
    .audio_codec       = AV_CODEC_ID_NONE,
 
192
    .video_codec       = AV_CODEC_ID_MJPEG,
193
193
    .write_packet      = ff_raw_write_packet,
194
 
    .flags= AVFMT_NOTIMESTAMPS,
 
194
    .flags             = AVFMT_NOTIMESTAMPS,
195
195
};
196
196
#endif
197
197
 
200
200
    .name              = "mlp",
201
201
    .long_name         = NULL_IF_CONFIG_SMALL("raw MLP"),
202
202
    .extensions        = "mlp",
203
 
    .audio_codec       = CODEC_ID_MLP,
204
 
    .video_codec       = CODEC_ID_NONE,
205
 
    .write_packet      = ff_raw_write_packet,
206
 
    .flags= AVFMT_NOTIMESTAMPS,
207
 
};
208
 
#endif
209
 
 
210
 
#if CONFIG_SRT_MUXER
211
 
AVOutputFormat ff_srt_muxer = {
212
 
    .name           = "srt",
213
 
    .long_name      = NULL_IF_CONFIG_SMALL("SubRip subtitle format"),
214
 
    .mime_type      = "application/x-subrip",
215
 
    .extensions     = "srt",
216
 
    .write_packet   = ff_raw_write_packet,
217
 
    .flags          = AVFMT_NOTIMESTAMPS,
218
 
    .subtitle_codec = CODEC_ID_SRT,
219
 
};
220
 
#endif
221
 
 
222
 
#if CONFIG_TRUEHD_MUXER
223
 
AVOutputFormat ff_truehd_muxer = {
224
 
    .name              = "truehd",
225
 
    .long_name         = NULL_IF_CONFIG_SMALL("raw TrueHD"),
226
 
    .extensions        = "thd",
227
 
    .audio_codec       = CODEC_ID_TRUEHD,
228
 
    .video_codec       = CODEC_ID_NONE,
229
 
    .write_packet      = ff_raw_write_packet,
230
 
    .flags= AVFMT_NOTIMESTAMPS,
 
203
    .audio_codec       = AV_CODEC_ID_MLP,
 
204
    .video_codec       = AV_CODEC_ID_NONE,
 
205
    .write_packet      = ff_raw_write_packet,
 
206
    .flags             = AVFMT_NOTIMESTAMPS,
231
207
};
232
208
#endif
233
209
 
237
213
    .long_name         = NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
238
214
    .mime_type         = "video/x-mpeg",
239
215
    .extensions        = "mpg,mpeg,m1v",
240
 
    .audio_codec       = CODEC_ID_NONE,
241
 
    .video_codec       = CODEC_ID_MPEG1VIDEO,
 
216
    .audio_codec       = AV_CODEC_ID_NONE,
 
217
    .video_codec       = AV_CODEC_ID_MPEG1VIDEO,
242
218
    .write_packet      = ff_raw_write_packet,
243
 
    .flags= AVFMT_NOTIMESTAMPS,
 
219
    .flags             = AVFMT_NOTIMESTAMPS,
244
220
};
245
221
#endif
246
222
 
249
225
    .name              = "mpeg2video",
250
226
    .long_name         = NULL_IF_CONFIG_SMALL("raw MPEG-2 video"),
251
227
    .extensions        = "m2v",
252
 
    .audio_codec       = CODEC_ID_NONE,
253
 
    .video_codec       = CODEC_ID_MPEG2VIDEO,
 
228
    .audio_codec       = AV_CODEC_ID_NONE,
 
229
    .video_codec       = AV_CODEC_ID_MPEG2VIDEO,
254
230
    .write_packet      = ff_raw_write_packet,
255
 
    .flags= AVFMT_NOTIMESTAMPS,
 
231
    .flags             = AVFMT_NOTIMESTAMPS,
256
232
};
257
233
#endif
258
234
 
259
235
#if CONFIG_RAWVIDEO_MUXER
260
236
AVOutputFormat ff_rawvideo_muxer = {
261
237
    .name              = "rawvideo",
262
 
    .long_name         = NULL_IF_CONFIG_SMALL("raw video format"),
 
238
    .long_name         = NULL_IF_CONFIG_SMALL("raw video"),
263
239
    .extensions        = "yuv,rgb",
264
 
    .audio_codec       = CODEC_ID_NONE,
265
 
    .video_codec       = CODEC_ID_RAWVIDEO,
266
 
    .write_packet      = ff_raw_write_packet,
267
 
    .flags= AVFMT_NOTIMESTAMPS,
 
240
    .audio_codec       = AV_CODEC_ID_NONE,
 
241
    .video_codec       = AV_CODEC_ID_RAWVIDEO,
 
242
    .write_packet      = ff_raw_write_packet,
 
243
    .flags             = AVFMT_NOTIMESTAMPS,
 
244
};
 
245
#endif
 
246
 
 
247
#if CONFIG_SRT_MUXER
 
248
AVOutputFormat ff_srt_muxer = {
 
249
    .name              = "srt",
 
250
    .long_name         = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
 
251
    .mime_type         = "application/x-subrip",
 
252
    .extensions        = "srt",
 
253
    .write_packet      = ff_raw_write_packet,
 
254
    .flags             = AVFMT_NOTIMESTAMPS,
 
255
    .subtitle_codec    = AV_CODEC_ID_SRT,
 
256
};
 
257
#endif
 
258
 
 
259
#if CONFIG_TRUEHD_MUXER
 
260
AVOutputFormat ff_truehd_muxer = {
 
261
    .name              = "truehd",
 
262
    .long_name         = NULL_IF_CONFIG_SMALL("raw TrueHD"),
 
263
    .extensions        = "thd",
 
264
    .audio_codec       = AV_CODEC_ID_TRUEHD,
 
265
    .video_codec       = AV_CODEC_ID_NONE,
 
266
    .write_packet      = ff_raw_write_packet,
 
267
    .flags             = AVFMT_NOTIMESTAMPS,
268
268
};
269
269
#endif