diff options
| author | jstebbins <[email protected]> | 2011-06-07 20:35:42 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-06-07 20:35:42 +0000 |
| commit | e07dec1ec259a52a893642da14856e16085f3c36 (patch) | |
| tree | be1327d7b2e3c16864c10ec70cccbc3e6185cd53 /contrib/ffmpeg/A01-mpegleak.patch | |
| parent | 67ea7b336383310f92188257a71665fc50cb115c (diff) | |
Bump FFmpeg from git-0b32da9 to git-v0.7b2-406-g7b20d35 (from Libav)
Highlights:
- Sources with more than 20 streams (video, audio and subtitles combined)
are now supported
- Adds decoding support for 10-bit H.264
- Adds frame-based threading for H.264 and VP8
Not yet enabled in HB. See experimental patch on RB to enable.
- Quality tweaks for the AC3 encoder
- AAC encoder improvements
Not yet enabled in HB. See experimental patch on RB to enable.
- Miscellaneous other fixes and improvements
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4028 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/A01-mpegleak.patch')
| -rw-r--r-- | contrib/ffmpeg/A01-mpegleak.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/ffmpeg/A01-mpegleak.patch b/contrib/ffmpeg/A01-mpegleak.patch index 49e99456d..44a99274e 100644 --- a/contrib/ffmpeg/A01-mpegleak.patch +++ b/contrib/ffmpeg/A01-mpegleak.patch @@ -38,10 +38,11 @@ Index: libavcodec/h264.c =================================================================== --- ffmpeg.orig/libavcodec/h264.c (revision 22823) +++ ffmpeg/libavcodec/h264.c (working copy) -@@ -2772,7 +2772,7 @@ +@@ -2772,8 +2772,8 @@ if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ - if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0; + if (avctx->skip_frame >= AVDISCARD_NONREF) + return 0; - av_log(avctx, AV_LOG_ERROR, "no frame!\n"); + av_log(avctx, AV_LOG_DEBUG, "no frame!\n"); return -1; @@ -57,6 +58,6 @@ Index: libavcodec/h264_refs.c */ - av_log(h->s.avctx, AV_LOG_ERROR, + av_log(h->s.avctx, AV_LOG_DEBUG, - "number of reference frames exceeds max (probably " + "number of reference frames (%d+%d) exceeds max (%d; probably " "corrupt input), discarding one\n"); |