diff --git a/src/main_window.cpp b/src/main_window.cpp index ca72de4..c220ec9 100644 --- a/src/main_window.cpp +++ b/src/main_window.cpp @@ -916,7 +916,7 @@ bool AC_MainWindow::startCamera(int res, int dev, const QString &outdir, bool re if(type == 0) ext = ".mp4"; else - ext = ".avi"; + ext = ".mp4"; //ext = (type == 0) ? ".mov" : ".avi"; Log(tr("Capture Device Opened [Camera]\n")); std::ostringstream time_stream; @@ -958,7 +958,7 @@ bool AC_MainWindow::startCamera(int res, int dev, const QString &outdir, bool re c_type = cv::VideoWriter::fourcc('m', 'p', '4', 'v'); break; case '1': - c_type = cv::VideoWriter::fourcc('X', 'V', 'I', 'D'); + c_type = cv::VideoWriter::fourcc('a', 'v', 'c', '1'); break; } writer = cv::VideoWriter(output_name.toStdString(), c_type, video_fps, cv::Size(res_w, res_h), true); @@ -1046,7 +1046,7 @@ bool AC_MainWindow::startVideo(const QString &filename, const QString &outdir, b c_type = cv::VideoWriter::fourcc('m', 'p', '4', 'v'); break; case '1': - c_type = cv::VideoWriter::fourcc('X', 'V', 'I', 'D'); + c_type = cv::VideoWriter::fourcc('a', 'v', 'c', '1'); break; } diff --git a/src/new_dialog.cpp b/src/new_dialog.cpp index c1c0d54..db806fa 100644 --- a/src/new_dialog.cpp +++ b/src/new_dialog.cpp @@ -51,7 +51,7 @@ void CaptureCamera::createControls() { video_type = new QComboBox(this); video_type->setGeometry(80, 90, 90, 25); video_type->addItem("MP4 - MPEG-4"); - video_type->addItem("AVI - XviD"); + video_type->addItem("MP4 - AVC/H.264"); } void CaptureCamera::setParent(AC_MainWindow *p) { @@ -120,7 +120,7 @@ void CaptureVideo::createControls() { video_type = new QComboBox(this); video_type->setGeometry(180, 55, 120, 25); video_type->addItem("MP4 - MPEG-4"); - video_type->addItem("AVI - XviD"); + video_type->addItem("MP4 - AVC/H.264"); connect(btn_setedit, SIGNAL(clicked()), this, SLOT(btn_SetSourceFile())); connect(btn_setout, SIGNAL(clicked()), this, SLOT(btn_SetOutputDir())); connect(btn_start, SIGNAL(clicked()), this, SLOT(btn_Start()));