diff options
| author | jstebbins <[email protected]> | 2010-04-25 21:15:43 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-04-25 21:15:43 +0000 |
| commit | c22e82ad0081856466a92a6e47a72b3ea9b5628c (patch) | |
| tree | 4118bfdb4913105820b98e7317021704c8f39faa /contrib/ffmpeg/A02-audioconvert.patch | |
| parent | e6ba7dc071b0b1f070b7f92e3b30eab1ee00a0b5 (diff) | |
bump ffmpeg to rev 22950
offset ffmpeg seeks by value of initial timestamp since it can be non-zero
catch pix fmt that is unsupported by swscale, log it, skip the track
use new ffmpeg avg_frame_rate for more accurate framerate estimate
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3267 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/A02-audioconvert.patch')
| -rw-r--r-- | contrib/ffmpeg/A02-audioconvert.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/ffmpeg/A02-audioconvert.patch b/contrib/ffmpeg/A02-audioconvert.patch index bec0cac7c..8bbb657d9 100644 --- a/contrib/ffmpeg/A02-audioconvert.patch +++ b/contrib/ffmpeg/A02-audioconvert.patch @@ -1,12 +1,13 @@ -diff -Naur ffmpeg.orig/libavcodec/Makefile ffmpeg/libavcodec/Makefile ---- ffmpeg.orig/libavcodec/Makefile 2008-12-01 01:40:36.000000000 -0500 -+++ ffmpeg/libavcodec/Makefile 2009-02-23 07:03:23.000000000 -0500 +Index: libavcodec/Makefile +=================================================================== +--- ffmpeg.orig/libavcodec/Makefile (revision 22823) ++++ ffmpeg/libavcodec/Makefile (working copy) @@ -3,7 +3,7 @@ NAME = avcodec FFLIBS = avutil --HEADERS = avcodec.h opt.h vdpau.h xvmc.h -+HEADERS = avcodec.h opt.h vdpau.h xvmc.h audioconvert.h +-HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h ++HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h audioconvert.h OBJS = allcodecs.o \ audioconvert.o \ |