Skip to content

Commit

Permalink
Merge pull request #20 from cchampet/fix_warning
Browse files Browse the repository at this point in the history
Fix warnings
  • Loading branch information
MarcAntoine-Arnaud committed Jul 15, 2014
2 parents fe38214 + c4b1c87 commit 1f268e1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 6 additions & 0 deletions src/AvTranscoder/Metadatas/VideoStreamProperties.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ VideoProperties videoStreamInfo(
#endif
#endif
case AVCOL_TRC_NB: vp.colorTransfert = "Not ABI"; break;
default: break;
}
switch( codec_context->colorspace )
{
Expand All @@ -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 )
{
Expand All @@ -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 )
{
Expand All @@ -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 )
{
Expand All @@ -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 );
Expand Down
3 changes: 1 addition & 2 deletions src/AvTranscoder/Profiles/XdCamHd422.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down

0 comments on commit 1f268e1

Please sign in to comment.