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

lavf/cafenc: Allow muxing opus.

Browse Source 
QuickTime does not require the (unknown) kuki chunk for decoding.
This commit is contained in:
Carl Eugen Hoyos 2017-10-17 21:35:28 +02:00
parent 552d2cb6f7
commit a3accd0c37
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/cafenc.c
View File

@ -81,6 +81,8 @@ static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels, int bl
return 320; return 320;
case AV_CODEC_ID_MP1: case AV_CODEC_ID_MP1:
return 384; return 384;
case AV_CODEC_ID_OPUS:
return 960;
case AV_CODEC_ID_MP2: case AV_CODEC_ID_MP2:
case AV_CODEC_ID_MP3: case AV_CODEC_ID_MP3:
return 1152; return 1152;
@ -117,7 +119,6 @@ static int caf_write_header(AVFormatContext *s)
switch (par->codec_id) { switch (par->codec_id) {
case AV_CODEC_ID_AAC: case AV_CODEC_ID_AAC:
case AV_CODEC_ID_OPUS:
av_log(s, AV_LOG_ERROR, "muxing codec currently unsupported\n"); av_log(s, AV_LOG_ERROR, "muxing codec currently unsupported\n");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }

2
libavformat/version.h
View File

@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here // Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 84 #define LIBAVFORMAT_VERSION_MINOR 84
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 101
#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, \