X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frawenc.c;h=eb5062610016db6a7d28b9ee28f4b753d8f1ad9b;hb=4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34;hp=6e9f4b78ecafede265914ccacce25db32eb12d39;hpb=779ef255e67162a125841716fd1e81c21feee359;p=ffmpeg diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 6e9f4b78eca..eb506261001 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -26,7 +26,6 @@ int ff_raw_write_packet(AVFormatContext *s, AVPacket *pkt) { avio_write(s->pb, pkt->data, pkt->size); - avio_flush(s->pb); return 0; } @@ -38,10 +37,10 @@ AVOutputFormat ff_ac3_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw AC-3"), .mime_type = "audio/x-ac3", .extensions = "ac3", - .audio_codec = CODEC_ID_AC3, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_AC3, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -50,8 +49,20 @@ AVOutputFormat ff_adx_muxer = { .name = "adx", .long_name = NULL_IF_CONFIG_SMALL("CRI ADX"), .extensions = "adx", - .audio_codec = CODEC_ID_ADPCM_ADX, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_ADPCM_ADX, + .video_codec = AV_CODEC_ID_NONE, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_CAVSVIDEO_MUXER +AVOutputFormat ff_cavsvideo_muxer = { + .name = "cavsvideo", + .long_name = NULL_IF_CONFIG_SMALL("raw Chinese AVS (Audio Video Standard) video"), + .extensions = "cavs", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_CAVS, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -62,10 +73,10 @@ AVOutputFormat ff_dirac_muxer = { .name = "dirac", .long_name = NULL_IF_CONFIG_SMALL("raw Dirac"), .extensions = "drc", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_DIRAC, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_DIRAC, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -74,10 +85,10 @@ AVOutputFormat ff_dnxhd_muxer = { .name = "dnxhd", .long_name = NULL_IF_CONFIG_SMALL("raw DNxHD (SMPTE VC-3)"), .extensions = "dnxhd", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_DNXHD, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_DNXHD, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -87,10 +98,10 @@ AVOutputFormat ff_dts_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw DTS"), .mime_type = "audio/x-dca", .extensions = "dts", - .audio_codec = CODEC_ID_DTS, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_DTS, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -100,10 +111,10 @@ AVOutputFormat ff_eac3_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw E-AC-3"), .mime_type = "audio/x-eac3", .extensions = "eac3", - .audio_codec = CODEC_ID_EAC3, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_EAC3, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -113,10 +124,10 @@ AVOutputFormat ff_g722_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw G.722"), .mime_type = "audio/G722", .extensions = "g722", - .audio_codec = CODEC_ID_ADPCM_G722, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_ADPCM_G722, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -126,10 +137,10 @@ AVOutputFormat ff_h261_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw H.261"), .mime_type = "video/x-h261", .extensions = "h261", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_H261, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_H261, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -139,46 +150,46 @@ AVOutputFormat ff_h263_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw H.263"), .mime_type = "video/x-h263", .extensions = "h263", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_H263, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_H263, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif #if CONFIG_H264_MUXER AVOutputFormat ff_h264_muxer = { .name = "h264", - .long_name = NULL_IF_CONFIG_SMALL("raw H.264 video format"), + .long_name = NULL_IF_CONFIG_SMALL("raw H.264 video"), .extensions = "h264", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_H264, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_H264, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif -#if CONFIG_CAVSVIDEO_MUXER -AVOutputFormat ff_cavsvideo_muxer = { - .name = "cavsvideo", - .long_name = NULL_IF_CONFIG_SMALL("raw Chinese AVS video"), - .extensions = "cavs", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_CAVS, +#if CONFIG_HEVC_MUXER +AVOutputFormat ff_hevc_muxer = { + .name = "hevc", + .long_name = NULL_IF_CONFIG_SMALL("raw HEVC video"), + .extensions = "hevc", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_HEVC, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif #if CONFIG_M4V_MUXER AVOutputFormat ff_m4v_muxer = { .name = "m4v", - .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), + .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-4 video"), .extensions = "m4v", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MPEG4, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MPEG4, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -188,10 +199,10 @@ AVOutputFormat ff_mjpeg_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw MJPEG video"), .mime_type = "video/x-mjpeg", .extensions = "mjpg,mjpeg", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MJPEG, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MJPEG, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -200,34 +211,10 @@ AVOutputFormat ff_mlp_muxer = { .name = "mlp", .long_name = NULL_IF_CONFIG_SMALL("raw MLP"), .extensions = "mlp", - .audio_codec = CODEC_ID_MLP, - .video_codec = CODEC_ID_NONE, - .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, -}; -#endif - -#if CONFIG_SRT_MUXER -AVOutputFormat ff_srt_muxer = { - .name = "srt", - .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle format"), - .mime_type = "application/x-subrip", - .extensions = "srt", - .write_packet = ff_raw_write_packet, - .flags = AVFMT_NOTIMESTAMPS, - .subtitle_codec = CODEC_ID_SRT, -}; -#endif - -#if CONFIG_TRUEHD_MUXER -AVOutputFormat ff_truehd_muxer = { - .name = "truehd", - .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), - .extensions = "thd", - .audio_codec = CODEC_ID_TRUEHD, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_MLP, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -237,10 +224,10 @@ AVOutputFormat ff_mpeg1video_muxer = { .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-1 video"), .mime_type = "video/x-mpeg", .extensions = "mpg,mpeg,m1v", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MPEG1VIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MPEG1VIDEO, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -249,21 +236,45 @@ AVOutputFormat ff_mpeg2video_muxer = { .name = "mpeg2video", .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-2 video"), .extensions = "m2v", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_MPEG2VIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif #if CONFIG_RAWVIDEO_MUXER AVOutputFormat ff_rawvideo_muxer = { .name = "rawvideo", - .long_name = NULL_IF_CONFIG_SMALL("raw video format"), + .long_name = NULL_IF_CONFIG_SMALL("raw video"), .extensions = "yuv,rgb", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_RAWVIDEO, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_RAWVIDEO, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_SRT_MUXER +AVOutputFormat ff_srt_muxer = { + .name = "srt", + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), + .mime_type = "application/x-subrip", + .extensions = "srt", .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, + .subtitle_codec = AV_CODEC_ID_SRT, +}; +#endif + +#if CONFIG_TRUEHD_MUXER +AVOutputFormat ff_truehd_muxer = { + .name = "truehd", + .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), + .extensions = "thd", + .audio_codec = AV_CODEC_ID_TRUEHD, + .video_codec = AV_CODEC_ID_NONE, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, }; #endif