Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Define ff_nut_video_tags and make Nut muxer and demuxer set it in

Browse Source 
codec_tag.

Originally committed as revision 23259 to svn://svn.ffmpeg.org/ffmpeg/trunk
oldabi
Stefano Sabatini 15 years ago
parent 6d9b7a7dab
commit 2e01def0fe
4 changed files with 36 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      libavformat/nut.c
  2. 1
      libavformat/nut.h
  3. 1
      libavformat/nutdec.c
  4. 2
      libavformat/nutenc.c

33
libavformat/nut.c
Unescape View File

@ -31,6 +31,39 @@ const AVCodecTag ff_nut_subtitle_tags[] = {
{ CODEC_ID_NONE , 0 }
};
const AVCodecTag ff_nut_video_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) },
{ CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) },
{ CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) },
{ CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) },
{ CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') },
{ CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') },
{ CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') },
{ CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') },
{ CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
{ CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
{ CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
{ CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') },
{ CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) },
{ CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) },
{ CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') },
{ CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
{ CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
{ CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
{ CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
{ CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
{ CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
{ CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') },
{ CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') },
{ CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8 ) },
{ CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8 ) },
{ CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4 ) },
{ CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4 ) },
{ CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) },
{ CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') },
{ CODEC_ID_NONE , 0 }
};
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
int i;
for(i=0; i<nut->avf->nb_streams; i++){

1
libavformat/nut.h
Unescape View File

@ -99,6 +99,7 @@ typedef struct {
} NUTContext;
extern const AVCodecTag ff_nut_subtitle_tags[];
extern const AVCodecTag ff_nut_video_tags[];
typedef struct {
char str[9];

1
libavformat/nutdec.c
Unescape View File

@ -924,5 +924,6 @@ AVInputFormat nut_demuxer = {
read_seek,
.extensions = "nut",
.metadata_conv = ff_nut_metadata_conv,
.codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
};
#endif

2
libavformat/nutenc.c
Unescape View File

@ -824,6 +824,6 @@ AVOutputFormat nut_muxer = {
write_packet,
write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0},
.codec_tag = (const AVCodecTag * const []){ ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 },
.metadata_conv = ff_nut_metadata_conv,
};

Write Preview
Loading…
Cancel
Save