Revision bd09e8a7

View differences:

libavformat/Makefile
38 38
OBJS-$(CONFIG_DAUD_MUXER)                += daud.o
39 39
OBJS-$(CONFIG_DIRAC_DEMUXER)             += raw.o
40 40
OBJS-$(CONFIG_DIRAC_MUXER)               += raw.o
41
OBJS-$(CONFIG_DNXHD_DEMUXER)             += raw.o
42
OBJS-$(CONFIG_DNXHD_MUXER)               += raw.o
41 43
OBJS-$(CONFIG_DSICIN_DEMUXER)            += dsicin.o
42 44
OBJS-$(CONFIG_DTS_DEMUXER)               += raw.o
43 45
OBJS-$(CONFIG_DTS_MUXER)                 += raw.o
libavformat/allformats.c
72 72
    REGISTER_MUXER    (CRC, crc);
73 73
    REGISTER_MUXDEMUX (DAUD, daud);
74 74
    REGISTER_MUXDEMUX (DIRAC, dirac);
75
    REGISTER_MUXDEMUX (DNXHD, dnxhd);
75 76
    REGISTER_DEMUXER  (DSICIN, dsicin);
76 77
    REGISTER_MUXDEMUX (DTS, dts);
77 78
    REGISTER_MUXDEMUX (DV, dv);
libavformat/avformat.h
22 22
#define AVFORMAT_AVFORMAT_H
23 23

  
24 24
#define LIBAVFORMAT_VERSION_MAJOR 52
25
#define LIBAVFORMAT_VERSION_MINOR 22
25
#define LIBAVFORMAT_VERSION_MINOR 23
26 26
#define LIBAVFORMAT_VERSION_MICRO  1
27 27

  
28 28
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
libavformat/raw.c
505 505
}
506 506
#endif
507 507

  
508
#ifdef CONFIG_DNXHD_DEMUXER
509
static int dnxhd_probe(AVProbeData *p)
510
{
511
    static const uint8_t header[] = {0x00,0x00,0x02,0x80,0x01};
512
    if (!memcmp(p->buf, header, 5))
513
        return AVPROBE_SCORE_MAX;
514
    else
515
        return 0;
516
}
517
#endif
518

  
508 519
#if defined(CONFIG_AC3_DEMUXER) || defined(CONFIG_EAC3_DEMUXER)
509 520
static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id)
510 521
{
......
640 651
};
641 652
#endif
642 653

  
654
#ifdef CONFIG_DNXHD_DEMUXER
655
AVInputFormat dnxhd_demuxer = {
656
    "dnxhd",
657
    NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
658
    0,
659
    dnxhd_probe,
660
    video_read_header,
661
    raw_read_partial_packet,
662
    .flags= AVFMT_GENERIC_INDEX,
663
    .value = CODEC_ID_DNXHD,
664
};
665
#endif
666

  
667
#ifdef CONFIG_DNXHD_MUXER
668
AVOutputFormat dnxhd_muxer = {
669
    "dnxhd",
670
    NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"),
671
    NULL,
672
    "dnxhd",
673
    0,
674
    CODEC_ID_NONE,
675
    CODEC_ID_DNXHD,
676
    NULL,
677
    raw_write_packet,
678
    .flags= AVFMT_NOTIMESTAMPS,
679
};
680
#endif
681

  
643 682
#ifdef CONFIG_DTS_DEMUXER
644 683
AVInputFormat dts_demuxer = {
645 684
    "dts",

Also available in: Unified diff