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/A01-mpegleak.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/A01-mpegleak.patch')
| -rw-r--r-- | contrib/ffmpeg/A01-mpegleak.patch | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/contrib/ffmpeg/A01-mpegleak.patch b/contrib/ffmpeg/A01-mpegleak.patch index 7b3b9be24..49e99456d 100644 --- a/contrib/ffmpeg/A01-mpegleak.patch +++ b/contrib/ffmpeg/A01-mpegleak.patch @@ -1,8 +1,8 @@ Index: libavcodec/mpegvideo.c =================================================================== ---- ffmpeg.orig/libavcodec/mpegvideo.c (revision 20594) +--- ffmpeg.orig/libavcodec/mpegvideo.c (revision 22823) +++ ffmpeg/libavcodec/mpegvideo.c (working copy) -@@ -834,19 +834,18 @@ +@@ -867,19 +867,18 @@ } av_log(s->avctx, AV_LOG_FATAL, "Internal error, picture buffer overflow\n"); @@ -36,18 +36,9 @@ Index: libavcodec/mpegvideo.c static void update_noise_reduction(MpegEncContext *s){ Index: libavcodec/h264.c =================================================================== ---- ffmpeg.orig/libavcodec/h264.c (revision 20594) +--- ffmpeg.orig/libavcodec/h264.c (revision 22823) +++ ffmpeg/libavcodec/h264.c (working copy) -@@ -3411,7 +3411,7 @@ - * stream. Need to discard one frame. Prevents overrun of the - * short_ref and long_ref buffers. - */ -- av_log(h->s.avctx, AV_LOG_ERROR, -+ av_log(h->s.avctx, AV_LOG_DEBUG, - "number of reference frames exceeds max (probably " - "corrupt input), discarding one\n"); - -@@ -7786,7 +7786,7 @@ +@@ -2772,7 +2772,7 @@ if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0; @@ -56,3 +47,16 @@ Index: libavcodec/h264.c return -1; } +Index: libavcodec/h264_refs.c +=================================================================== +--- ffmpeg.orig/libavcodec/h264_refs.c (revision 22823) ++++ ffmpeg/libavcodec/h264_refs.c (working copy) +@@ -608,7 +608,7 @@ + * stream. Need to discard one frame. Prevents overrun of the + * short_ref and long_ref buffers. + */ +- av_log(h->s.avctx, AV_LOG_ERROR, ++ av_log(h->s.avctx, AV_LOG_DEBUG, + "number of reference frames exceeds max (probably " + "corrupt input), discarding one\n"); + |