Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 22:54:11 +0000 (23:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 22:54:34 +0000 (23:54 +0100)
* commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7':
  rtpdec: DV depacketizer (RFC 6469)

Conflicts:
Changelog
libavformat/Makefile
libavformat/rtpdec_dv.c
libavformat/version.h

See: cbe508553ad17b277d4cb6f12f61aac4f52908b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/Makefile
libavformat/rtpdec_dv.c
libavformat/version.h

index 530e56b..02f899d 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -27,7 +27,7 @@ version <next>:
 - RTP depacketizer for AC3 payload format (RFC 4184)
 - palettegen and paletteuse filters
 - VP9 RTP payload format (draft 0) experimental depacketizer
-- DV RTP payload format (RFC 6469) depacketizer
+- RTP depacketizer for DV (RFC 6469)
 - DXVA2-accelerated HEVC decoding
 - AAC ELD 480 decoding
 - Intel QSV-accelerated H.264 decoding
index 61a7a81..2817be3 100644 (file)
@@ -32,7 +32,7 @@ OBJS-$(CONFIG_RTPDEC)                    += rdt.o                       \
                                             rtpdec_ac3.o                \
                                             rtpdec_amr.o                \
                                             rtpdec_asf.o                \
-                                            rtpdec_dv.o                \
+                                            rtpdec_dv.o                 \
                                             rtpdec_g726.o               \
                                             rtpdec_h261.o               \
                                             rtpdec_h263.o               \
index 94ac3d6..567a653 100644 (file)
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 #include "libavutil/avstring.h"
+
 #include "libavcodec/bytestream.h"
 
 #include "rtpdec_formats.h"
@@ -46,6 +46,7 @@ static void dv_free_dyn_buffer(AVIOContext **dyn_buf)
 
 static av_cold void dv_free_context(PayloadContext *data)
 {
+    dv_free_dyn_buffer(&data->buf);
     av_free(data);
 }
 
index 263465e..c23ce57 100644 (file)
@@ -30,9 +30,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 56
-
 #define LIBAVFORMAT_VERSION_MINOR  23
-#define LIBAVFORMAT_VERSION_MICRO 103
+#define LIBAVFORMAT_VERSION_MICRO 104
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \