summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-08-20 16:14:58 +0200
committerAnton Khirnov <anton@khirnov.net>2011-08-22 07:17:35 +0200
commitfb42d156ed3a726f9a6c76025ea9e1237e6b4840 (patch)
treeaf930304e959118fed3abcae04c0cf7d3e5196c2 /libavformat
parentb71389cbaee037f90ddaf4f7e8892a17831e860e (diff)
movenc: use libx264 by default when possible for mov, mp4 and psp
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/movenc.c12
1 files changed, 12 insertions, 0 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,