diff options
| author | jstebbins <[email protected]> | 2011-02-27 18:41:24 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-02-27 18:41:24 +0000 |
| commit | ad9e448f337bee816fd1fa0c5942eec668451c04 (patch) | |
| tree | 8c106b0af37dbbc3f1430a96980e9fc577c420a0 /libhb | |
| parent | 9b4b5cfec74d9055e6e6ce82ed49b34f5e94618f (diff) | |
bump ffmpeg from git-185a155 to git-0b32da9
fixes win64 crash
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3818 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/module.defs | 2 | ||||
| -rw-r--r-- | libhb/stream.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libhb/module.defs b/libhb/module.defs index 12db981e0..add884387 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -92,7 +92,7 @@ LIBHB.dll = $(LIBHB.build/)hb.dll LIBHB.lib = $(LIBHB.build/)hb.lib LIBHB.dll.libs = $(foreach n, \ - a52 ass avcore avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ + a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \ $(CONTRIB.build/)lib/lib$(n).a ) diff --git a/libhb/stream.c b/libhb/stream.c index 183f86930..4c118411b 100644 --- a/libhb/stream.c +++ b/libhb/stream.c @@ -2942,7 +2942,7 @@ static int ffmpeg_open( hb_stream_t *stream, hb_title_t *title ) // we're opening for scan. let ffmpeg put some info into the // log about what we've got. av_log_set_level( AV_LOG_INFO ); - dump_format( ic, 0, stream->path, 0 ); + av_dump_format( ic, 0, stream->path, 0 ); av_log_set_level( AV_LOG_ERROR ); // accept this file if it has at least one video stream we can decode |