diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-08-05 11:11:04 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-08-07 16:00:24 +0200 |
commit | 36ef5369ee9b336febc2c270f8718cec4476cb85 (patch) | |
tree | d186adbb488e7f002aa894743b1ce0e8925520e6 /libavformat/rawenc.c | |
parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) | |
download | ffmpeg-36ef5369ee9b336febc2c270f8718cec4476cb85.tar.gz |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavformat/rawenc.c')
-rw-r--r-- | libavformat/rawenc.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index f8e5277d6f..171c603549 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -38,8 +38,8 @@ 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, }; @@ -50,8 +50,8 @@ 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, }; @@ -62,8 +62,8 @@ AVOutputFormat ff_cavsvideo_muxer = { .name = "cavsvideo", .long_name = NULL_IF_CONFIG_SMALL("raw Chinese AVS (Audio Video Standard) video"), .extensions = "cavs", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_CAVS, + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_CAVS, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -74,8 +74,8 @@ 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, }; @@ -86,8 +86,8 @@ 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, }; @@ -99,8 +99,8 @@ 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, }; @@ -112,8 +112,8 @@ 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, }; @@ -125,8 +125,8 @@ 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, }; @@ -138,8 +138,8 @@ 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, }; @@ -151,8 +151,8 @@ 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, }; @@ -163,8 +163,8 @@ AVOutputFormat ff_h264_muxer = { .name = "h264", .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, }; @@ -175,8 +175,8 @@ AVOutputFormat ff_m4v_muxer = { .name = "m4v", .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, }; @@ -188,8 +188,8 @@ 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, }; @@ -200,8 +200,8 @@ 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, + .audio_codec = AV_CODEC_ID_MLP, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; @@ -213,8 +213,8 @@ 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, }; @@ -225,8 +225,8 @@ 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, }; @@ -237,8 +237,8 @@ AVOutputFormat ff_rawvideo_muxer = { .name = "rawvideo", .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, }; @@ -252,7 +252,7 @@ AVOutputFormat ff_srt_muxer = { .extensions = "srt", .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, - .subtitle_codec = CODEC_ID_SRT, + .subtitle_codec = AV_CODEC_ID_SRT, }; #endif @@ -261,8 +261,8 @@ 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_TRUEHD, + .video_codec = AV_CODEC_ID_NONE, .write_packet = ff_raw_write_packet, .flags = AVFMT_NOTIMESTAMPS, }; |