X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavformat%2Fnut.c;h=592fe4dc28a9b86431d4f72973403b53f0d7ce6e;hp=d969bbc5269ee0d1111026f5c2676b25ec896ae5;hb=c0b08ef94f037572876448990dca840b85432262;hpb=4b83fc0fe414dc7959a5511fcdce320ad90ac7ba diff --git a/libavformat/nut.c b/libavformat/nut.c index d969bbc526..592fe4dc28 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -19,75 +19,303 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mathematics.h" #include "libavutil/tree.h" #include "nut.h" +#include "riff.h" +#include "internal.h" const AVCodecTag ff_nut_subtitle_tags[] = { - { CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') }, - { CODEC_ID_SSA , MKTAG('S', 'S', 'A', 0 ) }, - { CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') }, - { CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') }, - { CODEC_ID_NONE , 0 } + { AV_CODEC_ID_TEXT, MKTAG('U', 'T', 'F', '8') }, + { AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') }, + { AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') }, + { AV_CODEC_ID_DVB_TELETEXT, MKTAG('D', 'V', 'B', 'T') }, + { AV_CODEC_ID_NONE, 0 } }; -void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){ +const AVCodecTag ff_nut_data_tags[] = { + { AV_CODEC_ID_TEXT, MKTAG('U', 'T', 'F', '8') }, + { AV_CODEC_ID_NONE, 0 } +}; + +const AVCodecTag ff_nut_video_tags[] = { + { AV_CODEC_ID_GIF, MKTAG('G', 'I', 'F', 0 ) }, + { AV_CODEC_ID_XFACE, MKTAG('X', 'F', 'A', 'C') }, + { AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') }, + { AV_CODEC_ID_HEVC, MKTAG('H', 'E', 'V', 'C') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 0 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 0 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 48 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'B', 'A', 64 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'R', 'A', 64 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'R', 'B', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'B', 'R', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 9 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 9 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 9 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 14 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 14 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 14 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0 , 8 ) }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 9) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(9, 0, '1', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 9) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(9, 11, '4', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 9) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(9, 10, '4', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 9) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(9, 0, '4', 'Y') }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 10) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '1', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 10) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 11, '4', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 10) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 10, '4', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 10) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '4', 'Y') }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 12) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12, 0, '1', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 16) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '1', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 16) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 11, '4', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 16) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 10, '4', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 16) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '4', 'Y') }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '3', 0, 8) }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '3', 0, 9) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG( 9, 0, '3', 'G') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '3', 0, 10) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '3', 'G') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '3', 0, 12) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12, 0, '3', 'G') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '3', 0, 14) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(14, 0, '3', 'G') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '3', 0, 16) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '3', 'G') }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '4', 0, 8) }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '4', 00 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 00 , '4', 'G') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '4', 00 , 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 00 , '4', 'G') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('G', '4', 00 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 00 , '4', 'G') }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG('X', 'Y', 'Z' , 36 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(36 , 'Z' , 'Y', 'X') }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG('P', 'A', 'L', 8 ) }, + + { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'B', 'G', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'B', 'G', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'G', 'B', 0xBA) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'R', 'G', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'R', 'G', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'G', 'R', 0xBA) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'G', 'B', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'G', 'B', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 'B', 'G', 0xBA) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'G', 'R', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(0xBA, 'G', 'R', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16, 'R', 'G', 0xBA) }, + + { AV_CODEC_ID_NONE, 0 } +}; + +const AVCodecTag ff_nut_audio_extra_tags[] = { + { AV_CODEC_ID_COMFORT_NOISE, MKTAG('3', '3', '8', '9') }, + { AV_CODEC_ID_PCM_ALAW, MKTAG('A', 'L', 'A', 'W') }, + { AV_CODEC_ID_PCM_MULAW, MKTAG('U', 'L', 'A', 'W') }, + { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, + { AV_CODEC_ID_OPUS, MKTAG('O', 'p', 'u', 's') }, + { AV_CODEC_ID_WAVPACK, MKTAG('w', 'v', 'p', 'k') }, + { AV_CODEC_ID_NONE, 0 } +}; + +const AVCodecTag ff_nut_audio_tags[] = { + { AV_CODEC_ID_PCM_F32BE, MKTAG(32 , 'D', 'F', 'P') }, + { AV_CODEC_ID_PCM_F32LE, MKTAG('P', 'F', 'D', 32 ) }, + { AV_CODEC_ID_PCM_F64BE, MKTAG(64 , 'D', 'F', 'P') }, + { AV_CODEC_ID_PCM_F64LE, MKTAG('P', 'F', 'D', 64 ) }, + { AV_CODEC_ID_PCM_S16BE, MKTAG(16 , 'D', 'S', 'P') }, + { AV_CODEC_ID_PCM_S16LE, MKTAG('P', 'S', 'D', 16 ) }, + { AV_CODEC_ID_PCM_S24BE, MKTAG(24 , 'D', 'S', 'P') }, + { AV_CODEC_ID_PCM_S24LE, MKTAG('P', 'S', 'D', 24 ) }, + { AV_CODEC_ID_PCM_S32BE, MKTAG(32 , 'D', 'S', 'P') }, + { AV_CODEC_ID_PCM_S32LE, MKTAG('P', 'S', 'D', 32 ) }, + { AV_CODEC_ID_PCM_S8, MKTAG('P', 'S', 'D', 8 ) }, + { AV_CODEC_ID_PCM_U16BE, MKTAG(16 , 'D', 'U', 'P') }, + { AV_CODEC_ID_PCM_U16LE, MKTAG('P', 'U', 'D', 16 ) }, + { AV_CODEC_ID_PCM_U24BE, MKTAG(24 , 'D', 'U', 'P') }, + { AV_CODEC_ID_PCM_U24LE, MKTAG('P', 'U', 'D', 24 ) }, + { AV_CODEC_ID_PCM_U32BE, MKTAG(32 , 'D', 'U', 'P') }, + { AV_CODEC_ID_PCM_U32LE, MKTAG('P', 'U', 'D', 32 ) }, + { AV_CODEC_ID_PCM_U8, MKTAG('P', 'U', 'D', 8 ) }, + { AV_CODEC_ID_PCM_S8_PLANAR, MKTAG('P', 'S', 'P', 8 ) }, + { AV_CODEC_ID_PCM_S16BE_PLANAR, MKTAG(16 , 'P', 'S', 'P') }, + { AV_CODEC_ID_PCM_S16LE_PLANAR, MKTAG('P', 'S', 'P', 16 ) }, + { AV_CODEC_ID_PCM_S24LE_PLANAR, MKTAG('P', 'S', 'P', 24 ) }, + { AV_CODEC_ID_PCM_S32LE_PLANAR, MKTAG('P', 'S', 'P', 32 ) }, + { AV_CODEC_ID_NONE, 0 } +}; + +const AVCodecTag * const ff_nut_codec_tags[] = { + ff_nut_video_tags, ff_nut_audio_tags, ff_nut_subtitle_tags, + ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_audio_extra_tags, ff_nut_data_tags, 0 +}; + +void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val) +{ int i; - for(i=0; iavf->nb_streams; i++){ - nut->stream[i].last_pts= av_rescale_rnd( - val, - time_base.num * (int64_t)nut->stream[i].time_base->den, - time_base.den * (int64_t)nut->stream[i].time_base->num, - AV_ROUND_DOWN); - } + for (i = 0; i < nut->avf->nb_streams; i++) + nut->stream[i].last_pts = + av_rescale_rnd(val, + time_base.num * (int64_t)nut->stream[i].time_base->den, + time_base.den * (int64_t)nut->stream[i].time_base->num, + AV_ROUND_DOWN); } -int64_t ff_lsb2full(StreamContext *stream, int64_t lsb){ - int64_t mask = (1<msb_pts_shift)-1; - int64_t delta= stream->last_pts - mask/2; - return ((lsb - delta)&mask) + delta; +int64_t ff_lsb2full(StreamContext *stream, int64_t lsb) +{ + int64_t mask = (1ULL << stream->msb_pts_shift) - 1; + int64_t delta = stream->last_pts - mask / 2; + return ((lsb - delta) & mask) + delta; } -int ff_nut_sp_pos_cmp(Syncpoint *a, Syncpoint *b){ - return ((a->pos - b->pos) >> 32) - ((b->pos - a->pos) >> 32); +int ff_nut_sp_pos_cmp(const void *a, const void *b) +{ + const Syncpoint *va = a, *vb = b; + return ((va->pos - vb->pos) >> 32) - ((vb->pos - va->pos) >> 32); } -int ff_nut_sp_pts_cmp(Syncpoint *a, Syncpoint *b){ - return ((a->ts - b->ts) >> 32) - ((b->ts - a->ts) >> 32); +int ff_nut_sp_pts_cmp(const void *a, const void *b) +{ + const Syncpoint *va = a, *vb = b; + return ((va->ts - vb->ts) >> 32) - ((vb->ts - va->ts) >> 32); } -void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts){ - Syncpoint *sp= av_mallocz(sizeof(Syncpoint)); - struct AVTreeNode *node= av_mallocz(av_tree_node_size); +int ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts) +{ + Syncpoint *sp = av_mallocz(sizeof(Syncpoint)); + struct AVTreeNode *node = av_tree_node_alloc(); + + if (!sp || !node) { + av_freep(&sp); + av_freep(&node); + return AVERROR(ENOMEM); + } + + nut->sp_count++; - sp->pos= pos; - sp->back_ptr= back_ptr; - sp->ts= ts; + sp->pos = pos; + sp->back_ptr = back_ptr; + sp->ts = ts; av_tree_insert(&nut->syncpoints, sp, ff_nut_sp_pos_cmp, &node); - if(node){ + if (node) { av_free(sp); av_free(node); } + + return 0; } -static void enu_free(void *opaque, void *elem) +static int enu_free(void *opaque, void *elem) { av_free(elem); + return 0; } void ff_nut_free_sp(NUTContext *nut) { - av_tree_enumerate(nut->syncpoints, NULL, NULL, enu_free); - av_tree_destroy(nut->syncpoints); + if (nut->syncpoints) { + av_tree_enumerate(nut->syncpoints, NULL, NULL, enu_free); + av_tree_destroy(nut->syncpoints); + } } 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} + { "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 } }; const AVMetadataConv ff_nut_metadata_conv[] = {