dict: add av_dict_parse_string()

[ffmpeg] / libavformat / g723_1.c

diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c
index 415d01b48090988867053a519baa0b9c39895e5a..0b927029369f53aa38e703fc21911ff591236c2d 100644 (file)
--- a/libavformat/g723_1.c
+++ b/libavformat/g723_1.c
@@ -24,7 +24,7 @@
  * G.723.1 demuxer
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 #include "internal.h"
 
@@ -39,7 +39,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;
@@ -77,7 +77,7 @@ static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat ff_g723_1_demuxer = {
     .name        = "g723_1",
-    .long_name   = NULL_IF_CONFIG_SMALL("G.723.1 format"),
+    .long_name   = NULL_IF_CONFIG_SMALL("G.723.1"),
     .read_header = g723_1_init,
     .read_packet = g723_1_read_packet,
     .extensions  = "tco",