diff options
| author | Misty De Meo | 2014-01-22 10:11:34 -0800 |
|---|---|---|
| committer | Misty De Meo | 2014-01-22 12:59:03 -0800 |
| commit | 4e7f31e4a206c5815f352ac6541275648b7e0c7d (patch) | |
| tree | 2255acd176fc0ced758a15513914f694b53788f0 /Library/Formula/libquicktime.rb | |
| parent | c4fccd69cf3f21439de725e35e2318d3f5e123c6 (diff) | |
| download | homebrew-4e7f31e4a206c5815f352ac6541275648b7e0c7d.tar.bz2 | |
libquicktime: fix build with ffmpeg 2.x
Diffstat (limited to 'Library/Formula/libquicktime.rb')
| -rw-r--r-- | Library/Formula/libquicktime.rb | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/Library/Formula/libquicktime.rb b/Library/Formula/libquicktime.rb index 84819a4e5..c8103f915 100644 --- a/Library/Formula/libquicktime.rb +++ b/Library/Formula/libquicktime.rb @@ -13,6 +13,15 @@ class Libquicktime < Formula depends_on 'ffmpeg' => :optional depends_on 'libvorbis' => :optional + # Fixes compilation with ffmpeg 2.x; applied upstream + # http://sourceforge.net/p/libquicktime/mailman/message/30792767/ + def patches + { + :p0 => "http://sourceforge.net/p/libquicktime/mailman/attachment/51812B9E.3090802%40mirriad.com/1/", + :p1 => DATA + } + end + def install system "./configure", "--disable-debug", "--disable-dependency-tracking", @@ -25,3 +34,27 @@ class Libquicktime < Formula system "make install" end end + +__END__ +diff --git a/plugins/ffmpeg/audio.c b/plugins/ffmpeg/audio.c +index bc8d750..b185587 100644 +--- a/plugins/ffmpeg/audio.c ++++ b/plugins/ffmpeg/audio.c +@@ -515,7 +515,7 @@ static int decode_chunk_vbr(quicktime_t * file, int track) + if(!chunk_packets) + return 0; + +- new_samples = num_samples + AVCODEC_MAX_AUDIO_FRAME_SIZE / (2 * track_map->channels); ++ new_samples = num_samples + 192000 / (2 * track_map->channels); + + if(codec->sample_buffer_alloc < + codec->sample_buffer_end - codec->sample_buffer_start + new_samples) +@@ -671,7 +671,7 @@ static int decode_chunk(quicktime_t * file, int track) + */ + + num_samples += 8192; +- new_samples = num_samples + AVCODEC_MAX_AUDIO_FRAME_SIZE / (2 * track_map->channels); ++ new_samples = num_samples + 192000 / (2 * track_map->channels); + + /* Reallocate sample buffer */ + |