libopenh264enc: export CPB props side data

[ffmpeg] / libavformat / rtpdec_latm.c

diff --git a/libavformat/rtpdec_latm.c b/libavformat/rtpdec_latm.c
index 3ee552e414e38c30e963b0a978606e915c6007ac..d22cc1d215562afc9102ee18e704a9ef47bd7082 100644 (file)
--- a/libavformat/rtpdec_latm.c
+++ b/libavformat/rtpdec_latm.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "avio_internal.h"
 #include "rtpdec_formats.h"
 #include "internal.h"
 #include "libavutil/avstring.h"
@@ -31,13 +32,9 @@ struct PayloadContext {
     uint32_t timestamp;
 };
 
-static void latm_free_context(PayloadContext *data)
+static void latm_close_context(PayloadContext *data)
 {
-    if (data->dyn_buf) {
-        uint8_t *p;
-        avio_close_dyn_buf(data->dyn_buf, &p);
-        av_free(p);
-    }
+    ffio_free_dyn_buf(&data->dyn_buf);
     av_free(data->buf);
 }
 
@@ -51,10 +48,7 @@ static int latm_parse_packet(AVFormatContext *ctx, PayloadContext *data,
     if (buf) {
         if (!data->dyn_buf || data->timestamp != *timestamp) {
             av_freep(&data->buf);
-            if (data->dyn_buf)
-                avio_close_dyn_buf(data->dyn_buf, &data->buf);
-            data->dyn_buf = NULL;
-            av_freep(&data->buf);
+            ffio_free_dyn_buf(&data->dyn_buf);
 
             data->timestamp = *timestamp;
             if ((ret = avio_open_dyn_buf(&data->dyn_buf)) < 0)
@@ -103,7 +97,7 @@ static int parse_fmtp_config(AVStream *st, const char *value)
     int audio_mux_version, same_time_framing, num_programs, num_layers;
 
     /* Pad this buffer, too, to avoid out of bounds reads with get_bits below */
-    config = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
+    config = av_mallocz(len + AV_INPUT_BUFFER_PADDING_SIZE);
     if (!config)
         return AVERROR(ENOMEM);
     ff_hex_to_data(config, value);
@@ -124,7 +118,7 @@ static int parse_fmtp_config(AVStream *st, const char *value)
     av_freep(&st->codec->extradata);
     st->codec->extradata_size = (get_bits_left(&gb) + 7)/8;
     st->codec->extradata = av_mallocz(st->codec->extradata_size +
-                                      FF_INPUT_BUFFER_PADDING_SIZE);
+                                      AV_INPUT_BUFFER_PADDING_SIZE);
     if (!st->codec->extradata) {
         ret = AVERROR(ENOMEM);
         goto end;
@@ -177,6 +171,6 @@ RTPDynamicProtocolHandler ff_mp4a_latm_dynamic_handler = {
     .codec_id           = AV_CODEC_ID_AAC,
     .priv_data_size     = sizeof(PayloadContext),
     .parse_sdp_a_line   = latm_parse_sdp_line,
-    .free               = latm_free_context,
+    .close              = latm_close_context,
     .parse_packet       = latm_parse_packet,
 };