Merge commit '199fb40278146c5bb162990c66ad3cd561abc780'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:40:58 +0000 (00:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 23:42:14 +0000 (00:42 +0100)
* commit '199fb40278146c5bb162990c66ad3cd561abc780':
  rtpdec: Use ffio_free_dyn_buf

Conflicts:
libavformat/rtpdec_latm.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec_ac3.c
libavformat/rtpdec_asf.c
libavformat/rtpdec_dv.c
libavformat/rtpdec_h261.c
libavformat/rtpdec_h263_rfc2190.c
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpa_robust.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_vp8.c
libavformat/rtpdec_xiph.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -33,12 -34,8 +34,8 @@@ struct PayloadContext 
  
  static void latm_free_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);
 +    av_freep(&data->buf);
  }
  
  static int latm_parse_packet(AVFormatContext *ctx, PayloadContext *data,
Simple merge
@@@ -28,7 -28,7 +28,8 @@@
  
  #include <string.h>
  #include "libavutil/intreadwrite.h"
+ #include "avio_internal.h"
 +#include "internal.h"
  #include "rtp.h"
  #include "rtpdec.h"
  #include "rtpdec_formats.h"
Simple merge
@@@ -33,7 -32,9 +33,8 @@@
  #include "libavutil/base64.h"
  #include "libavcodec/bytestream.h"
  
 -#include <assert.h>
 -
+ #include "avio_internal.h"
 +#include "internal.h"
  #include "rtpdec.h"
  #include "rtpdec_formats.h"
  
@@@ -49,20 -50,10 +50,10 @@@ struct PayloadContext 
      int split_pkts;
  };
  
- static void free_fragment(PayloadContext * data)
- {
-     if (data->fragment) {
-         uint8_t* p;
-         avio_close_dyn_buf(data->fragment, &p);
-         av_free(p);
-         data->fragment = NULL;
-     }
- }
  static void xiph_free_context(PayloadContext * data)
  {
-     free_fragment(data);
+     ffio_free_dyn_buf(&data->fragment);
 -    av_free(data->split_buf);
 +    av_freep(&data->split_buf);
  }