diff options
| -rw-r--r-- | libavformat/movenc.c | 12 | ||||
| -rwxr-xr-x | tests/lavf-regression.sh | 2 |
2 files changed, 13 insertions, 1 deletions
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 |