Browse code

Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'

* 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>

Michael Niedermayer authored on 2015/02/23 07:54:11
Showing 4 changed files
... ...
@@ -27,7 +27,7 @@ version <next>:
27 27
 - RTP depacketizer for AC3 payload format (RFC 4184)
28 28
 - palettegen and paletteuse filters
29 29
 - VP9 RTP payload format (draft 0) experimental depacketizer
30
-- DV RTP payload format (RFC 6469) depacketizer
30
+- RTP depacketizer for DV (RFC 6469)
31 31
 - DXVA2-accelerated HEVC decoding
32 32
 - AAC ELD 480 decoding
33 33
 - Intel QSV-accelerated H.264 decoding
... ...
@@ -32,7 +32,7 @@ OBJS-$(CONFIG_RTPDEC)                    += rdt.o                       \
32 32
                                             rtpdec_ac3.o                \
33 33
                                             rtpdec_amr.o                \
34 34
                                             rtpdec_asf.o                \
35
-                                            rtpdec_dv.o                \
35
+                                            rtpdec_dv.o                 \
36 36
                                             rtpdec_g726.o               \
37 37
                                             rtpdec_h261.o               \
38 38
                                             rtpdec_h263.o               \
... ...
@@ -17,10 +17,10 @@
17 17
  * You should have received a copy of the GNU Lesser General Public
18 18
  * License along with FFmpeg; if not, write to the Free Software
19 19
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
- *
21 20
  */
22 21
 
23 22
 #include "libavutil/avstring.h"
23
+
24 24
 #include "libavcodec/bytestream.h"
25 25
 
26 26
 #include "rtpdec_formats.h"
... ...
@@ -46,6 +46,7 @@ static void dv_free_dyn_buffer(AVIOContext **dyn_buf)
46 46
 
47 47
 static av_cold void dv_free_context(PayloadContext *data)
48 48
 {
49
+    dv_free_dyn_buffer(&data->buf);
49 50
     av_free(data);
50 51
 }
51 52
 
... ...
@@ -30,9 +30,8 @@
30 30
 #include "libavutil/version.h"
31 31
 
32 32
 #define LIBAVFORMAT_VERSION_MAJOR 56
33
-
34 33
 #define LIBAVFORMAT_VERSION_MINOR  23
35
-#define LIBAVFORMAT_VERSION_MICRO 103
34
+#define LIBAVFORMAT_VERSION_MICRO 104
36 35
 
37 36
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
38 37
                                                LIBAVFORMAT_VERSION_MINOR, \