← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to src/codecs.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/codecs.c
190
190
     NULL,
191
191
     0},
192
192
    {
 
193
     "FFV1",
 
194
     N_("FFmpeg Video 1"),
 
195
     CODEC_ID_FFV1,
 
196
     {24, 1},
 
197
     one_to_hundred_range,
 
198
     len_one_to_hundred_range,
 
199
     NULL,
 
200
     0},
 
201
    {
193
202
     "FLASH_VIDEO",
194
203
     N_("Flash Video"),
195
204
     CODEC_ID_FLV1,
200
209
     NULL,
201
210
     0},
202
211
    {
 
212
     "FLASH_SV",
 
213
     N_("Flash Screen Video"),
 
214
     CODEC_ID_FLASHSV,
 
215
     {24, 1},
 
216
     one_to_hundred_range,
 
217
     len_one_to_hundred_range,
 
218
     NULL,
 
219
     0},
 
220
    {
203
221
     "DV",
204
222
     N_("DV Video"),
205
223
     CODEC_ID_DVVIDEO,
267
285
       N_("Ogg Vorbis"),
268
286
       CODEC_ID_VORBIS}
269
287
    , {
 
288
       "AC3",
 
289
       N_("Dolby Digital AC-3"),
 
290
       CODEC_ID_AC3}
 
291
    , {
270
292
       "PCM16",
271
293
       N_("PCM"),
272
294
       CODEC_ID_PCM_S16LE}
331
353
 
332
354
#define len_extension_m2v (sizeof(extension_m2v) / sizeof(char*))
333
355
 
 
356
static const char *extension_dvd[] = { "vob", "dvd" };
 
357
 
 
358
#define len_extension_dvd (sizeof(extension_dvd) / sizeof(char*))
 
359
 
334
360
static const char *extension_mov[] = { "mov", "qt" };
335
361
 
336
362
#define len_extension_mov (sizeof(extension_mov) / sizeof(char*))
364
390
#ifdef HAVE_LIBTHEORA
365
391
    CODEC_THEORA,
366
392
#endif     // HAVE_LIBTHEORA
367
 
    CODEC_DV
 
393
    CODEC_DV,
 
394
    CODEC_FFV1
368
395
};
369
396
 
370
397
#define len_allowed_vid_codecs_avi (sizeof(allowed_vid_codecs_avi) / \
375
402
#define len_allowed_vid_codecs_asf (sizeof(allowed_vid_codecs_asf) / \
376
403
    sizeof(XVC_CodecID))
377
404
 
378
 
static const XVC_CodecID allowed_vid_codecs_flv[] = { CODEC_FLV };
 
405
static const XVC_CodecID allowed_vid_codecs_flv[] =
 
406
    { CODEC_FLV, CODEC_FLASHSV };
379
407
 
380
408
#define len_allowed_vid_codecs_flv (sizeof(allowed_vid_codecs_flv) / \
381
409
    sizeof(XVC_CodecID))
451
479
 
452
480
#define len_au_codecs_mp2 (sizeof(au_codecs_mp2) / \
453
481
    sizeof(XVC_AuCodecID))
 
482
 
 
483
static const XVC_AuCodecID au_codecs_ac3[] = { AU_CODEC_AC3 };
 
484
 
 
485
#define len_au_codecs_ac3 (sizeof(au_codecs_ac3) / \
 
486
    sizeof(XVC_AuCodecID))
 
487
 
454
488
#endif     // HAVE_FFMPEG_AUDIO
455
489
#endif     // USE_FFMPEG
456
490
 
660
694
     len_extension_dv},
661
695
    {
662
696
     "mpeg",
663
 
     N_("MPEG1 System Format"),
 
697
     N_("MPEG1 System Format (VCD)"),
664
698
     "mpeg",
665
699
     CODEC_MPEG1,
666
700
     allowed_vid_codecs_mpeg1,
678
712
     len_extension_m1v},
679
713
    {
680
714
     "mpeg2",
681
 
     N_("MPEG2 PS Format"),
 
715
     N_("MPEG2 PS Format (SVCD)"),
682
716
     "svcd",
683
717
     CODEC_MPEG2,
684
718
     allowed_vid_codecs_mpeg2,
695
729
     extension_m2v,
696
730
     len_extension_m2v},
697
731
    {
 
732
     "vob",
 
733
     N_("MPEG2 PS format (DVD VOB)"),
 
734
     "dvd",
 
735
     CODEC_MPEG2,
 
736
     allowed_vid_codecs_mpeg2,
 
737
     len_allowed_vid_codecs_mpeg2,
 
738
#ifdef HAVE_FFMPEG_AUDIO
 
739
     AU_CODEC_AC3,
 
740
     au_codecs_ac3,
 
741
     len_au_codecs_ac3,
 
742
#else
 
743
     AU_CODEC_NONE,
 
744
     NULL,
 
745
     0,
 
746
#endif     // HAVE_FFMPEG_AUDIO
 
747
     extension_dvd,
 
748
     len_extension_dvd},
 
749
    {
698
750
     "mov",
699
751
     N_("Quicktime Format"),
700
752
     "mov",
918
970
 * @return the fps value read from the string or { 0, 1}
919
971
 */
920
972
XVC_Fps
921
 
xvc_read_fps_from_string (char *fps_string)
 
973
xvc_read_fps_from_string (const char *fps_string)
922
974
{
923
975
    struct lconv *loc = localeconv ();
924
976
    XVC_Fps fps = { 0, 1 };