Fix deprecated warnings into properties classes

avTranscoder · Feb 12, 2020 · fb86d8d · fb86d8d
1 parent da05a71
commit fb86d8d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/AvTranscoder/properties/DataProperties.cpp b/src/AvTranscoder/properties/DataProperties.cpp
@@ -73,7 +73,7 @@ void DataProperties::detectAncillaryData()
             detection = true;
         }
 
-        av_free_packet(&pkt);
+        av_packet_unref(&pkt);
 
         if(detection)
             break;

diff --git a/src/AvTranscoder/properties/PixelProperties.cpp b/src/AvTranscoder/properties/PixelProperties.cpp
@@ -64,7 +64,7 @@ size_t PixelProperties::getMaxNbBitsInChannels() const
     size_t maxNbBitsInChannels = 0;
     for(unsigned int channelIndex = 0; channelIndex < _pixelDesc->nb_components; ++channelIndex)
     {
-        const size_t nbBits = _pixelDesc->comp[channelIndex].depth_minus1 + 1;
+        const size_t nbBits = _pixelDesc->comp[channelIndex].depth;
         if(nbBits > maxNbBitsInChannels)
             maxNbBitsInChannels = nbBits;
     }
@@ -227,7 +227,7 @@ std::vector<Channel> PixelProperties::getChannels() const
         Channel c;
         c.id = channel;
         c.chromaHeight = (size_t)_pixelDesc->comp[channel].plane;
-        c.bitStep = (size_t)_pixelDesc->comp[channel].step_minus1;
+        c.bitStep = (size_t)_pixelDesc->comp[channel].step - 1;
         channels.push_back(c);
     }
     return channels;

diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -558,7 +558,7 @@ size_t VideoProperties::analyseGopStructure(IProgress& progress)
         AVFrame& avFrame = frame.getAVFrame();
 
         _gopStructure.push_back(
-            std::make_pair(av_get_picture_type_char(avFrame.pict_type), av_frame_get_pkt_size(&avFrame)));
+            std::make_pair(av_get_picture_type_char(avFrame.pict_type), avFrame.pkt_size));
         _isInterlaced = avFrame.interlaced_frame;
         _isTopFieldFirst = avFrame.top_field_first;
         if(avFrame.pict_type == AV_PICTURE_TYPE_I)