diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 23:54:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-22 23:54:34 +0100 |
| commit | db4a2976f6afb6ac16bdd455695dcc277a03416d (patch) | |
| tree | 4beb864664ddb62d9a6b56dbb6ea9609f2772222 | |
| parent | 0a32a1b4bbcdffe5c6a61a9e8ea64a17bf31f172 (diff) | |
| parent | c99915f7c74ce1249d8633cb6fd09035b8d84db7 (diff) | |
| download | ffmpeg-db4a2976f6afb6ac16bdd455695dcc277a03416d.tar.gz | |
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>
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/rtpdec_dv.c | 3 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
4 files changed, 5 insertions, 5 deletions
@@ -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 diff --git a/libavformat/Makefile b/libavformat/Makefile index 61a7a81e94..2817be35d7 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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 \ diff --git a/libavformat/rtpdec_dv.c b/libavformat/rtpdec_dv.c index 94ac3d6308..567a653020 100644 --- a/libavformat/rtpdec_dv.c +++ b/libavformat/rtpdec_dv.c @@ -17,10 +17,10 @@ * 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); } diff --git a/libavformat/version.h b/libavformat/version.h index 263465e5ad..c23ce57d75 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -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, \ |