Revision 2e01def0

View differences:

libavformat/nut.c
31 31
    { CODEC_ID_NONE        , 0                         }
32 32
};
33 33

  
34
const AVCodecTag ff_nut_video_tags[] = {
35
    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) },
36
    { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) },
37
    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) },
38
    { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) },
39
    { CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') },
40
    { CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') },
41
    { CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') },
42
    { CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') },
43
    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
44
    { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
45
    { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
46
    { CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') },
47
    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) },
48
    { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) },
49
    { CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') },
50
    { CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
51
    { CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
52
    { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
53
    { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
54
    { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
55
    { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
56
    { CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') },
57
    { CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') },
58
    { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R',  8 ) },
59
    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B',  8 ) },
60
    { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R',  4 ) },
61
    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B',  4 ) },
62
    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) },
63
    { CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') },
64
    { CODEC_ID_NONE    , 0                         }
65
};
66

  
34 67
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
35 68
    int i;
36 69
    for(i=0; i<nut->avf->nb_streams; i++){
libavformat/nut.h
99 99
} NUTContext;
100 100

  
101 101
extern const AVCodecTag ff_nut_subtitle_tags[];
102
extern const AVCodecTag ff_nut_video_tags[];
102 103

  
103 104
typedef struct {
104 105
    char str[9];
libavformat/nutdec.c
924 924
    read_seek,
925 925
    .extensions = "nut",
926 926
    .metadata_conv = ff_nut_metadata_conv,
927
    .codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
927 928
};
928 929
#endif
libavformat/nutenc.c
824 824
    write_packet,
825 825
    write_trailer,
826 826
    .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
827
    .codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0},
827
    .codec_tag = (const AVCodecTag * const []){ ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
828 828
    .metadata_conv = ff_nut_metadata_conv,
829 829
};

Also available in: Unified diff