Merge pull request #20 from cchampet/fix_warning

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 1f268e1e164c · 2014-07-15T18:13:00.000+02:00
Fix warnings
diff --git a/src/AvTranscoder/Metadatas/VideoStreamProperties.hpp b/src/AvTranscoder/Metadatas/VideoStreamProperties.hpp
@@ -203,6 +203,7 @@ VideoProperties videoStreamInfo(
  #endif
 #endif
 		case AVCOL_TRC_NB:           vp.colorTransfert = "Not ABI"; break;
+		default: break;
 	}
 	switch( codec_context->colorspace )
 	{
@@ -227,13 +228,15 @@ VideoProperties videoStreamInfo(
  #endif
 #endif
 		case AVCOL_SPC_NB:          vp.colorspace = "Not ABI"; break;
+		default: break;
 	}
 	switch( codec_context->color_range )
 	{
 		case AVCOL_RANGE_UNSPECIFIED: vp.colorRange = "unspecified"; break;
 		case AVCOL_RANGE_MPEG:        vp.colorRange = "Head"; break;
 		case AVCOL_RANGE_JPEG:        vp.colorRange = "Full"; break;
 		case AVCOL_RANGE_NB:          vp.colorRange = "Not ABI"; break;
+		default: break;
 	}
 	switch( codec_context->color_primaries )
 	{
@@ -250,6 +253,7 @@ VideoProperties videoStreamInfo(
  #endif
 #endif
 		case AVCOL_PRI_NB:          vp.colorPrimaries = "Not ABI"; break;
+		default: break;
 	}
 	switch( codec_context->chroma_sample_location )
 	{
@@ -261,6 +265,7 @@ VideoProperties videoStreamInfo(
 		case AVCHROMA_LOC_BOTTOMLEFT:  vp.chromaSampleLocation = "bottom left"; break;
 		case AVCHROMA_LOC_BOTTOM:      vp.chromaSampleLocation = "bottom"; break;
 		case AVCHROMA_LOC_NB:          vp.chromaSampleLocation = "Not ABI"; break;
+		default: break;
 	}
 	switch( codec_context->field_order )
 	{
@@ -270,6 +275,7 @@ VideoProperties videoStreamInfo(
 		case AV_FIELD_BB:          vp.fieldOrder = "bottom bottom"; break;
 		case AV_FIELD_TB:          vp.fieldOrder = "top bottom"; break;
 		case AV_FIELD_BT:          vp.fieldOrder = "bottom top"; break;
+		default: break;
 	}
 #if LIBAVUTIL_VERSION_MAJOR > 51
 	const AVPixFmtDescriptor* pixFmt = av_pix_fmt_desc_get( codec_context->pix_fmt );
diff --git a/src/AvTranscoder/Profiles/XdCamHd422.hpp b/src/AvTranscoder/Profiles/XdCamHd422.hpp
@@ -72,8 +72,7 @@ void loadXdCamHD422( Profile::ProfilesDesc& profiles )
 	xdCamHd422[ "i_qfactor" ] = "-0.8";
 	xdCamHd422[ "flags" ] = "-cgop"; // open GOP
 
-	xdCamHd422[ "flags" ] = "+ilme";  // use interlaced motion estimation
-	xdCamHd422[ "flags" ] = "+ildct"; // use interlaced DCT
+	xdCamHd422[ "flags" ] = "+ilme+ildct";  // use interlaced motion estimation + use interlaced DCT
 
 	xdCamHd422[ "field_order" ] = "tt";
 

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,7 @@ VideoProperties videoStreamInfo(`
`203`	`203`	`#endif`
`204`	`204`	`#endif`
`205`	`205`	`case AVCOL_TRC_NB: vp.colorTransfert = "Not ABI"; break;`
	`206`	`+ default: break;`
`206`	`207`	`}`
`207`	`208`	`switch( codec_context->colorspace )`
`208`	`209`	`{`
`@@ -227,13 +228,15 @@ VideoProperties videoStreamInfo(`
`227`	`228`	`#endif`
`228`	`229`	`#endif`
`229`	`230`	`case AVCOL_SPC_NB: vp.colorspace = "Not ABI"; break;`
	`231`	`+ default: break;`
`230`	`232`	`}`
`231`	`233`	`switch( codec_context->color_range )`
`232`	`234`	`{`
`233`	`235`	`case AVCOL_RANGE_UNSPECIFIED: vp.colorRange = "unspecified"; break;`
`234`	`236`	`case AVCOL_RANGE_MPEG: vp.colorRange = "Head"; break;`
`235`	`237`	`case AVCOL_RANGE_JPEG: vp.colorRange = "Full"; break;`
`236`	`238`	`case AVCOL_RANGE_NB: vp.colorRange = "Not ABI"; break;`
	`239`	`+ default: break;`
`237`	`240`	`}`
`238`	`241`	`switch( codec_context->color_primaries )`
`239`	`242`	`{`
`@@ -250,6 +253,7 @@ VideoProperties videoStreamInfo(`
`250`	`253`	`#endif`
`251`	`254`	`#endif`
`252`	`255`	`case AVCOL_PRI_NB: vp.colorPrimaries = "Not ABI"; break;`
	`256`	`+ default: break;`
`253`	`257`	`}`
`254`	`258`	`switch( codec_context->chroma_sample_location )`
`255`	`259`	`{`
`@@ -261,6 +265,7 @@ VideoProperties videoStreamInfo(`
`261`	`265`	`case AVCHROMA_LOC_BOTTOMLEFT: vp.chromaSampleLocation = "bottom left"; break;`
`262`	`266`	`case AVCHROMA_LOC_BOTTOM: vp.chromaSampleLocation = "bottom"; break;`
`263`	`267`	`case AVCHROMA_LOC_NB: vp.chromaSampleLocation = "Not ABI"; break;`
	`268`	`+ default: break;`
`264`	`269`	`}`
`265`	`270`	`switch( codec_context->field_order )`
`266`	`271`	`{`
`@@ -270,6 +275,7 @@ VideoProperties videoStreamInfo(`
`270`	`275`	`case AV_FIELD_BB: vp.fieldOrder = "bottom bottom"; break;`
`271`	`276`	`case AV_FIELD_TB: vp.fieldOrder = "top bottom"; break;`
`272`	`277`	`case AV_FIELD_BT: vp.fieldOrder = "bottom top"; break;`
	`278`	`+ default: break;`
`273`	`279`	`}`
`274`	`280`	`#if LIBAVUTIL_VERSION_MAJOR > 51`
`275`	`281`	`const AVPixFmtDescriptor* pixFmt = av_pix_fmt_desc_get( codec_context->pix_fmt );`