examples/decode_video: switch to the new decoding API

[ffmpeg] / libavformat / rtpdec_ilbc.c

diff --git a/libavformat/rtpdec_ilbc.c b/libavformat/rtpdec_ilbc.c
index 7159dcf6be4bdda236559801b2a9035b3e08ee97..798ae360338ea5cb4d515cd17dda31b63bde180a 100644 (file)
--- a/libavformat/rtpdec_ilbc.c
+++ b/libavformat/rtpdec_ilbc.c
@@ -23,20 +23,21 @@
 #include "rtpdec_formats.h"
 #include "libavutil/avstring.h"
 
-static int ilbc_parse_fmtp(AVStream *stream, PayloadContext *data,
-                           char *attr, char *value)
+static int ilbc_parse_fmtp(AVFormatContext *s,
+                           AVStream *stream, PayloadContext *data,
+                           const char *attr, const char *value)
 {
     if (!strcmp(attr, "mode")) {
         int mode = atoi(value);
         switch (mode) {
         case 20:
-            stream->codec->block_align = 38;
+            stream->codecpar->block_align = 38;
             break;
         case 30:
-            stream->codec->block_align = 50;
+            stream->codecpar->block_align = 50;
             break;
         default:
-            av_log(NULL, AV_LOG_ERROR, "Unsupported iLBC mode %d\n", mode);
+            av_log(s, AV_LOG_ERROR, "Unsupported iLBC mode %d\n", mode);
             return AVERROR(EINVAL);
         }
     }
@@ -54,10 +55,10 @@ static int ilbc_parse_sdp_line(AVFormatContext *s, int st_index,
     st = s->streams[st_index];
 
     if (av_strstart(line, "fmtp:", &p)) {
-        int ret = ff_parse_fmtp(st, data, p, ilbc_parse_fmtp);
+        int ret = ff_parse_fmtp(s, st, data, p, ilbc_parse_fmtp);
         if (ret < 0)
             return ret;
-        if (!st->codec->block_align) {
+        if (!st->codecpar->block_align) {
             av_log(s, AV_LOG_ERROR, "No iLBC mode set\n");
             return AVERROR(EINVAL);
         }
@@ -68,6 +69,6 @@ static int ilbc_parse_sdp_line(AVFormatContext *s, int st_index,
 RTPDynamicProtocolHandler ff_ilbc_dynamic_handler = {
     .enc_name         = "iLBC",
     .codec_type       = AVMEDIA_TYPE_AUDIO,
-    .codec_id         = CODEC_ID_ILBC,
+    .codec_id         = AV_CODEC_ID_ILBC,
     .parse_sdp_a_line = ilbc_parse_sdp_line,
 };