diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2008-03-07 19:25:09 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2008-03-07 19:25:09 +0000 |
| commit | 90c2295b24e9fa0c857e459088d18945a6681ef0 (patch) | |
| tree | 682f689f79fb24ab9cf3277aadaf71c8af625231 /libavformat/nut.c | |
| parent | b049ad505478a099535a796306f619a4365ee707 (diff) | |
| download | ffmpeg-90c2295b24e9fa0c857e459088d18945a6681ef0.tar.gz | |
Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
of matroska and nut.
Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/nut.c')
| -rw-r--r-- | libavformat/nut.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index 4f6d319dc7..e790691fc8 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -68,3 +68,14 @@ void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts){ av_free(node); } } + +const Dispositions ff_nut_dispositions[] = { + {"default" , AV_DISPOSITION_DEFAULT}, + {"dub" , AV_DISPOSITION_DUB}, + {"original" , AV_DISPOSITION_ORIGINAL}, + {"comment" , AV_DISPOSITION_COMMENT}, + {"lyrics" , AV_DISPOSITION_LYRICS}, + {"karaoke" , AV_DISPOSITION_KARAOKE}, + {"" , 0} +}; + |