highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'

Browse Source 
* commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7':
  rtpdec: DV depacketizer (RFC 6469)

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

See: cbe508553a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-22 23:54:11 +01:00
parent 0a32a1b4bb c99915f7c7
commit db4a2976f6
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -27,7 +27,7 @@ version <next>:
- RTP depacketizer for AC3 payload format (RFC 4184) - RTP depacketizer for AC3 payload format (RFC 4184)
- palettegen and paletteuse filters - palettegen and paletteuse filters
- VP9 RTP payload format (draft 0) experimental depacketizer - 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 - DXVA2-accelerated HEVC decoding
- AAC ELD 480 decoding - AAC ELD 480 decoding
- Intel QSV-accelerated H.264 decoding - Intel QSV-accelerated H.264 decoding

2
libavformat/Makefile
View File

@@ -32,7 +32,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \
rtpdec_ac3.o \ rtpdec_ac3.o \
rtpdec_amr.o \ rtpdec_amr.o \
rtpdec_asf.o \ rtpdec_asf.o \
rtpdec_dv.o \ rtpdec_dv.o \
rtpdec_g726.o \ rtpdec_g726.o \
rtpdec_h261.o \ rtpdec_h261.o \
rtpdec_h263.o \ rtpdec_h263.o \

3
libavformat/rtpdec_dv.c
View File

@@ -17,10 +17,10 @@
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/ */
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "rtpdec_formats.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) static av_cold void dv_free_context(PayloadContext *data)
{ {
dv_free_dyn_buffer(&data->buf);
av_free(data); av_free(data);
} }

3
libavformat/version.h
View File

@@ -30,9 +30,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MAJOR 56
#define LIBAVFORMAT_VERSION_MINOR 23 #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, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \