util/viddec3test: Update use of deprecated APIs and enums
[glsdk/omapdrmtest.git] / viddec3test.c
index 984334a771d201e9f53a61140a1563eaac8eebfb..edaaf41775c7712043b93abcff17aa063e2640e3 100644 (file)
@@ -157,7 +157,7 @@ decoder_open(int argc, char **argv)
                /* calculate output buffer parameters: */
                width  = ALIGN2 (width, 4);        /* round up to macroblocks */
                height = ALIGN2 (height, 4);       /* round up to macroblocks */
-               if (decoder->demux->cc->codec_id == CODEC_ID_MPEG2VIDEO) {
+               if (decoder->demux->cc->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
                        padded_width = width;
                        padded_height= height;
                }
@@ -230,15 +230,15 @@ decoder_open(int argc, char **argv)
        decoder->params->numOutputDataUnits = 0;
        decoder->params->errorInfoMode    = IVIDEO_ERRORINFO_OFF;
 
-       if (decoder->demux->cc->codec_id == CODEC_ID_MPEG2VIDEO) {
+       if (decoder->demux->cc->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
             decoder->codec = VIDDEC3_create(decoder->engine,
                                         "ivahd_mpeg2vdec", decoder->params);
         }
-        else if (decoder->demux->cc->codec_id == CODEC_ID_H264) {
+        else if (decoder->demux->cc->codec_id == AV_CODEC_ID_H264) {
             decoder->codec = VIDDEC3_create(decoder->engine,
                                         "ivahd_h264dec", decoder->params);
         }
-       else if (decoder->demux->cc->codec_id == CODEC_ID_MPEG4) {
+       else if (decoder->demux->cc->codec_id == AV_CODEC_ID_MPEG4) {
                decoder->demux->first_in_buff = 1;
                decoder->codec = VIDDEC3_create(decoder->engine,
                                         "ivahd_mpeg4dec", decoder->params);