rtpenc: Restructure if statements in packetizers to simplify adding more conditions

[ffmpeg] / libavformat / g723_1.c

diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c
index e9ae10b0660508c1a283e5e804a4f563d248207e..b67c07c4045c9afcbe45bba657c5f9b759fa6e65 100644 (file)
--- a/libavformat/g723_1.c
+++ b/libavformat/g723_1.c
@@ -24,13 +24,14 @@
  * G.723.1 demuxer
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/attributes.h"
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 #include "internal.h"
 
 static const uint8_t frame_size[4] = { 24, 20, 4, 1 };
 
-static int g723_1_init(AVFormatContext *s)
+static av_cold int g723_1_init(AVFormatContext *s)
 {
     AVStream *st;
 
@@ -39,7 +40,7 @@ static int g723_1_init(AVFormatContext *s)
         return AVERROR(ENOMEM);
 
     st->codec->codec_type     = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_id       = CODEC_ID_G723_1;
+    st->codec->codec_id       = AV_CODEC_ID_G723_1;
     st->codec->channel_layout = AV_CH_LAYOUT_MONO;
     st->codec->channels       = 1;
     st->codec->sample_rate    = 8000;