From 3436c4a368aca1bdcbf28bdfc996903460263de0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 20 Aug 2011 16:02:22 +0200 Subject: matroskaenc: saner default codecs. libvorbis/libx264 for video if available, otherwise ac3/mpeg4. --- tests/lavf-regression.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/lavf-regression.sh') diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 859ccb946e..a3a0b86b96 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -103,7 +103,7 @@ do_lavf nut "-acodec mp2" fi if [ -n "$do_mkv" ] ; then -do_lavf mkv +do_lavf mkv "-c:a mp2 -c:v mpeg4" fi -- cgit v1.2.3 From b71389cbaee037f90ddaf4f7e8892a17831e860e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 20 Aug 2011 16:05:17 +0200 Subject: avienc: saner default audio codec. libmp3lame if available, ac3 otherwise. --- libavformat/avienc.c | 6 +++++- tests/lavf-regression.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'tests/lavf-regression.sh') diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 1dbed8bc80..cf2e1d601d 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -644,7 +644,11 @@ AVOutputFormat ff_avi_muxer = { .mime_type = "video/x-msvideo", .extensions = "avi", .priv_data_size = sizeof(AVIContext), - .audio_codec = CODEC_ID_MP2, +#if CONFIG_LIBMP3LAME_ENCODER + .audio_codec = CODEC_ID_MP3, +#else + .audio_codec = CODEC_ID_AC3, +#endif .video_codec = CODEC_ID_MPEG4, .write_header = avi_write_header, .write_packet = avi_write_packet, diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index a3a0b86b96..8ed92771d0 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -44,7 +44,7 @@ do_audio_only() } if [ -n "$do_avi" ] ; then -do_lavf avi +do_lavf avi "-acodec mp2" fi if [ -n "$do_asf" ] ; then -- cgit v1.2.3 From fb42d156ed3a726f9a6c76025ea9e1237e6b4840 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 20 Aug 2011 16:14:58 +0200 Subject: movenc: use libx264 by default when possible for mov, mp4 and psp --- libavformat/movenc.c | 12 ++++++++++++ tests/lavf-regression.sh | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'tests/lavf-regression.sh') diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 03959106c5..5ac95b804d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2343,7 +2343,11 @@ AVOutputFormat ff_mov_muxer = { .extensions = "mov", .priv_data_size = sizeof(MOVMuxContext), .audio_codec = CODEC_ID_AAC, +#if CONFIG_LIBX264_ENCODER + .video_codec = CODEC_ID_H264, +#else .video_codec = CODEC_ID_MPEG4, +#endif .write_header = mov_write_header, .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, @@ -2376,7 +2380,11 @@ AVOutputFormat ff_mp4_muxer = { .extensions = "mp4", .priv_data_size = sizeof(MOVMuxContext), .audio_codec = CODEC_ID_AAC, +#if CONFIG_LIBX264_ENCODER + .video_codec = CODEC_ID_H264, +#else .video_codec = CODEC_ID_MPEG4, +#endif .write_header = mov_write_header, .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, @@ -2392,7 +2400,11 @@ AVOutputFormat ff_psp_muxer = { .extensions = "mp4,psp", .priv_data_size = sizeof(MOVMuxContext), .audio_codec = CODEC_ID_AAC, +#if CONFIG_LIBX264_ENCODER + .video_codec = CODEC_ID_H264, +#else .video_codec = CODEC_ID_MPEG4, +#endif .write_header = mov_write_header, .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 8ed92771d0..1d7f640124 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -87,7 +87,7 @@ do_lavf flv -an fi if [ -n "$do_mov" ] ; then -do_lavf mov "-acodec pcm_alaw" +do_lavf mov "-acodec pcm_alaw -c:v mpeg4" fi if [ -n "$do_dv_fmt" ] ; then -- cgit v1.2.3