diff options
| author | jstebbins <[email protected]> | 2011-02-04 19:38:03 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-02-04 19:38:03 +0000 |
| commit | 728d264fd8c930a61665839257b080784a6d186c (patch) | |
| tree | f2a60feaa208274def692782da57dbc1b98bee5e /contrib | |
| parent | dbd2efd6fdd65e09e31f53214e18b5b117fb2cc0 (diff) | |
bump ffmpeg from svn 25689 to git 185a155
Fixes a couple h.264 decode issues
Fixes uft16-le chapter names in mov/mp4 files
Improved ac3 encoder
Numerous other bug fixes and improvements
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3779 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ffmpeg/A00-mov-utf16-chapters.patch | 25 | ||||
| -rw-r--r-- | contrib/ffmpeg/module.defs | 2 |
2 files changed, 1 insertions, 26 deletions
diff --git a/contrib/ffmpeg/A00-mov-utf16-chapters.patch b/contrib/ffmpeg/A00-mov-utf16-chapters.patch deleted file mode 100644 index 1dfde74e6..000000000 --- a/contrib/ffmpeg/A00-mov-utf16-chapters.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/libavformat/mov.c b/libavformat/mov.c -index 4370b48..b28c9ae 100644 ---- a/libavformat/mov.c -+++ b/libavformat/mov.c -@@ -2334,6 +2334,20 @@ static void mov_read_chapters(AVFormatContext *s) - av_freep(&title); - title = utf8; - } -+ else if (AV_RL16(title+2) == 0xfeff) { -+ uint8_t *utf8 = av_malloc(2*len+3); -+ -+ i8 = i16 = 0; -+ while (i16 < len) { -+ uint32_t ch; -+ uint8_t tmp; -+ GET_UTF16(ch, i16 < len ? AV_RL16(title + (i16+=2)) : 0, break;) -+ PUT_UTF8(ch, tmp, if (i8 < 2*len) utf8[2+i8++] = tmp;) -+ } -+ utf8[2+i8] = 0; -+ av_freep(&title); -+ title = utf8; -+ } - - ff_new_chapter(s, i, st->time_base, sample->timestamp, end, title+2); - av_freep(&title); diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 304183ffe..bda0e8101 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,BZIP2 FAAD2 ZLIB)) $(eval $(call import.CONTRIB.defs,FFMPEG)) -FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-r25689.tar.bz2 +FFMPEG.FETCH.url = http://download.m0k.org/handbrake/contrib/ffmpeg-git-185a155.tar.bz2 FFMPEG.CONFIGURE.deps = FFMPEG.CONFIGURE.env = |