Fix build after FF_INPUT_BUFFER_PADDING_SIZE/AV_CODEC_FLAG_GLOBAL_HEADER were removed

Author: gkv311

StMoviePlayer/StVideo/StVideoQueue.cpp

@@ -309,7 +309,7 @@ bool StVideoQueue::init(AVFormatContext*   theFormatCtx,
                           && (getCodedSizeY() == 1080 || getCodedSizeY() == 1088);
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 0, 0))
     if(is720in1080) {
-        myCodecCtx->flags2 |= CODEC_FLAG2_IGNORE_CROP;
+        myCodecCtx->flags2 |= AV_CODEC_FLAG2_IGNORE_CROP;
     }
 #endif
 

StShared/StAVIOContext.cpp

@@ -48,7 +48,7 @@ namespace {
 StAVIOContext::StAVIOContext()
 : myAvioCtx(NULL) {
     const int aBufferSize = 32768;
-    unsigned char* aBufferIO = (unsigned char* )av_malloc(aBufferSize + FF_INPUT_BUFFER_PADDING_SIZE);
+    unsigned char* aBufferIO = (unsigned char* )av_malloc(aBufferSize + AV_INPUT_BUFFER_PADDING_SIZE);
     myAvioCtx = avio_alloc_context(aBufferIO, aBufferSize, 0, this, readCallback, writeCallback, seekCallback);
 }
 

StShared/StAVPacket.cpp

@@ -108,9 +108,9 @@ void StAVPacket::setAVpkt(const AVPacket& theCopy) {
 #endif
 
     // now copy data with special padding space
-    myPacket.data = stMemAllocAligned<uint8_t*>((theCopy.size + FF_INPUT_BUFFER_PADDING_SIZE), 16); // data must be aligned to 16 bytes for SSE!
+    myPacket.data = stMemAllocAligned<uint8_t*>((theCopy.size + AV_INPUT_BUFFER_PADDING_SIZE), 16); // data must be aligned to 16 bytes for SSE!
     stMemCpy (myPacket.data, theCopy.data, theCopy.size);
-    stMemZero(myPacket.data + (ptrdiff_t )theCopy.size, FF_INPUT_BUFFER_PADDING_SIZE);
+    stMemZero(myPacket.data + (ptrdiff_t )theCopy.size, AV_INPUT_BUFFER_PADDING_SIZE);
 
 #if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 118, 0))
     if(myPacket.side_data_elems > 0) {
@@ -121,9 +121,9 @@ void StAVPacket::setAVpkt(const AVPacket& theCopy) {
         for(int anIter = 0; anIter < theCopy.side_data_elems; ++anIter) {
             aSize = theCopy.side_data[anIter].size;
             myPacket.side_data[anIter] = theCopy.side_data[anIter];
-            myPacket.side_data[anIter].data = stMemAllocAligned<uint8_t*>(aSize + FF_INPUT_BUFFER_PADDING_SIZE, 16);
+            myPacket.side_data[anIter].data = stMemAllocAligned<uint8_t*>(aSize + AV_INPUT_BUFFER_PADDING_SIZE, 16);
             stMemCpy (myPacket.side_data[anIter].data, theCopy.side_data[anIter].data, aSize);
-            stMemZero(myPacket.side_data[anIter].data + (ptrdiff_t )aSize, FF_INPUT_BUFFER_PADDING_SIZE);
+            stMemZero(myPacket.side_data[anIter].data + (ptrdiff_t )aSize, AV_INPUT_BUFFER_PADDING_SIZE);
         }
     }
 #endif

StShared/StAVVideoMuxer.cpp

@@ -219,7 +219,7 @@ bool StAVVideoMuxer::addStream(AVFormatContext* theContext,
     }
 
     if(theContext->oformat->flags & AVFMT_GLOBALHEADER) {
-        aCodecCtxNew->flags |= CODEC_FLAG_GLOBAL_HEADER;
+        aCodecCtxNew->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
     }
     return true;
 }

include/StAV/stAV.h

@@ -49,6 +49,17 @@ extern "C" {
     #define AV_NUM_DATA_POINTERS 4
 #endif
 
+// Compatibility with older FFmpeg (API change since 2015-07-27 - lavc 56.56.100 / 56.35.0)
+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
+    #define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
+#endif
+#ifndef AV_CODEC_FLAG_GLOBAL_HEADER
+    #define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
+#endif
+#ifndef AV_CODEC_FLAG2_IGNORE_CROP
+    #define AV_CODEC_FLAG2_IGNORE_CROP CODEC_FLAG2_IGNORE_CROP
+#endif
+
 #ifdef _MSC_VER
     #pragma warning(default : 4244)
 #endif