[FFmpeg-devel] [PATCH] h264: don't store intra pcm samples in h->mb.

[Michael Niedermayer]

On Sat, Feb 16, 2013 at 09:35:12AM -0800, Ronald S. Bultje wrote:
> From: "Ronald S. Bultje" <rsbultje at gmail.com>
> 
> Instead, keep them in the bitstream buffer until we read them verbatim,
> this saves a memcpy() and a subsequent clearing of the target buffer.
> decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from
> 6121.4 to 6095.5 cycles, i.e. 26 cycles faster.

it seems antons patch broke this too

Applying: h264: don't store intra pcm samples in h->mb.
fatal: sha1 information is lacking or useless (libavcodec/h264.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 h264: don't store intra pcm samples in h->mb.

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

He who knows, does not speak. He who speaks, does not know. -- Lao Tsu
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130216/f396da3c/attachment.asc>