| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * nut muxer | 2  * nut muxer | 
| 3  * Copyright (c) 2004-2007 Michael Niedermayer | 3  * Copyright (c) 2004-2007 Michael Niedermayer | 
| 4  * | 4  * | 
| 5  * This file is part of FFmpeg. | 5  * This file is part of FFmpeg. | 
| 6  * | 6  * | 
| 7  * FFmpeg is free software; you can redistribute it and/or | 7  * FFmpeg is free software; you can redistribute it and/or | 
| 8  * modify it under the terms of the GNU Lesser General Public | 8  * modify it under the terms of the GNU Lesser General Public | 
| 9  * License as published by the Free Software Foundation; either | 9  * License as published by the Free Software Foundation; either | 
| 10  * version 2.1 of the License, or (at your option) any later version. | 10  * version 2.1 of the License, or (at your option) any later version. | 
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 484 | 484 | 
| 485     av_free(dyn_buf); | 485     av_free(dyn_buf); | 
| 486     return count; | 486     return count; | 
| 487 } | 487 } | 
| 488 | 488 | 
| 489 static int write_headers(AVFormatContext *avctx, ByteIOContext *bc){ | 489 static int write_headers(AVFormatContext *avctx, ByteIOContext *bc){ | 
| 490     NUTContext *nut = avctx->priv_data; | 490     NUTContext *nut = avctx->priv_data; | 
| 491     ByteIOContext *dyn_bc; | 491     ByteIOContext *dyn_bc; | 
| 492     int i, ret; | 492     int i, ret; | 
| 493 | 493 | 
|  | 494     ff_metadata_conv_ctx(avctx, ff_nut_metadata_conv, NULL); | 
|  | 495 | 
| 494     ret = url_open_dyn_buf(&dyn_bc); | 496     ret = url_open_dyn_buf(&dyn_bc); | 
| 495     if(ret < 0) | 497     if(ret < 0) | 
| 496         return ret; | 498         return ret; | 
| 497     write_mainheader(nut, dyn_bc); | 499     write_mainheader(nut, dyn_bc); | 
| 498     put_packet(nut, bc, dyn_bc, 1, MAIN_STARTCODE); | 500     put_packet(nut, bc, dyn_bc, 1, MAIN_STARTCODE); | 
| 499 | 501 | 
| 500     for (i=0; i < nut->avf->nb_streams; i++){ | 502     for (i=0; i < nut->avf->nb_streams; i++){ | 
| 501         ret = url_open_dyn_buf(&dyn_bc); | 503         ret = url_open_dyn_buf(&dyn_bc); | 
| 502         if(ret < 0) | 504         if(ret < 0) | 
| 503             return ret; | 505             return ret; | 
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 803     CODEC_ID_MP3, | 805     CODEC_ID_MP3, | 
| 804 #else | 806 #else | 
| 805     CODEC_ID_MP2, | 807     CODEC_ID_MP2, | 
| 806 #endif | 808 #endif | 
| 807     CODEC_ID_MPEG4, | 809     CODEC_ID_MPEG4, | 
| 808     write_header, | 810     write_header, | 
| 809     write_packet, | 811     write_packet, | 
| 810     write_trailer, | 812     write_trailer, | 
| 811     .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, | 813     .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, | 
| 812     .codec_tag = (const AVCodecTag * const []){ ff_codec_bmp_tags, ff_nut_video_
     tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 }, | 814     .codec_tag = (const AVCodecTag * const []){ ff_codec_bmp_tags, ff_nut_video_
     tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 }, | 
| 813     .metadata_conv = ff_nut_metadata_conv, |  | 
| 814 }; | 815 }; | 
| OLD | NEW | 
|---|