[FFmpeg-cvslog] h264_ps: declare array of colorspace strings on its own line.

Ronald S. Bultje git at videolan.org
Mon Jul 30 23:32:24 CEST 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Jul 28 21:45:24 2012 -0700| [be391fb6df9a6bb25e0f97357c0a7d0ff7af6c1a] | committer: Ronald S. Bultje

h264_ps: declare array of colorspace strings on its own line.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be391fb6df9a6bb25e0f97357c0a7d0ff7af6c1a
---

 libavcodec/h264_ps.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 3f53af8..7d9d596 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -431,6 +431,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
         sps->sar.den= 1;
 
     if(s->avctx->debug&FF_DEBUG_PICT_INFO){
+        static const char csp[4][5] = { "Gray", "420", "422", "444" };
         av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s %s %d/%d\n",
                sps_id, sps->profile_idc, sps->level_idc,
                sps->poc_type,
@@ -441,7 +442,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
                sps->crop_left, sps->crop_right,
                sps->crop_top, sps->crop_bottom,
                sps->vui_parameters_present_flag ? "VUI" : "",
-               ((const char*[]){"Gray","420","422","444"})[sps->chroma_format_idc],
+               csp[sps->chroma_format_idc],
                sps->timing_info_present_flag ? sps->num_units_in_tick : 0,
                sps->timing_info_present_flag ? sps->time_scale : 0
                );



More information about the ffmpeg-cvslog mailing list