virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases 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
This commit is contained in:
Stefano Sabatini 2010-05-23 18:34:15 +00:00
parent 6d9b7a7dab
commit 2e01def0fe
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libavformat/nut.c
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
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
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
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,
};