diff options
| author | Rodeo <[email protected]> | 2014-03-26 14:13:08 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-03-26 14:13:08 +0000 |
| commit | fc40ba55cdc0221526d144fa84a955e46198ea69 (patch) | |
| tree | 0b17ded7581bbaa1ae718471b38376597f212cb7 /contrib/ffmpeg | |
| parent | 844c185f87eae47a25ce86e2977d60bc9c57476d (diff) | |
Bump libav to v10.
More of our patches have been merged upstream.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6130 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/A01-hevc-matroska.patch | 45 | ||||
| -rw-r--r-- | contrib/ffmpeg/module.defs | 2 |
2 files changed, 1 insertions, 46 deletions
diff --git a/contrib/ffmpeg/A01-hevc-matroska.patch b/contrib/ffmpeg/A01-hevc-matroska.patch deleted file mode 100644 index 1c22d6cc6..000000000 --- a/contrib/ffmpeg/A01-hevc-matroska.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/libavformat/Makefile b/libavformat/Makefile -index a3cd504..5694314 100644 ---- a/libavformat/Makefile -+++ b/libavformat/Makefile -@@ -168,7 +168,7 @@ OBJS-$(CONFIG_M4V_MUXER) += rawenc.o - OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ - isom.o rmsipr.o - OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ -- isom.o avc.o \ -+ isom.o avc.o hevc.o \ - flacenc_header.o avlanguage.o wv.o - OBJS-$(CONFIG_MD5_MUXER) += md5enc.o - OBJS-$(CONFIG_MJPEG_DEMUXER) += rawdec.o -diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c -index 3ab3139..fad1ec4 100644 ---- a/libavformat/matroskaenc.c -+++ b/libavformat/matroskaenc.c -@@ -22,6 +22,7 @@ - #include <stdint.h> - - #include "avc.h" -+#include "hevc.h" - #include "avformat.h" - #include "avlanguage.h" - #include "flacenc.h" -@@ -500,6 +501,8 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo - ret = put_wv_codecpriv(dyn_cp, codec); - else if (codec->codec_id == AV_CODEC_ID_H264) - ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size); -+ else if (codec->codec_id == AV_CODEC_ID_HEVC) -+ ret = ff_isom_write_hvcc(dyn_cp, codec->extradata, codec->extradata_size, 0); - else if (codec->codec_id == AV_CODEC_ID_ALAC) { - if (codec->extradata_size < 36) { - av_log(s, AV_LOG_ERROR, -@@ -1164,6 +1167,10 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, - if (codec->codec_id == AV_CODEC_ID_H264 && codec->extradata_size > 0 && - (AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1)) - ff_avc_parse_nal_units_buf(pkt->data, &data, &size); -+ else if (codec->codec_id == AV_CODEC_ID_HEVC && codec->extradata_size > 6 && -+ (AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1)) -+ /* extradata is Annex B, assume the bitstream is too and convert it */ -+ ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL); - else if (codec->codec_id == AV_CODEC_ID_WAVPACK) { - int ret = mkv_strip_wavpack(pkt->data, &data, &size); - if (ret < 0) { diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 32e4e7624..b6ce56411 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -5,7 +5,7 @@ $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB FDKAAC)) endif $(eval $(call import.CONTRIB.defs,FFMPEG)) -FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v10_beta2.tar.bz2 +FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v10.tar.bz2 FFMPEG.CONFIGURE.deps = FFMPEG.CONFIGURE.env = |