[FFmpeg-devel] [PATCH] hwaccel: add VideoToolbox support.

[Michael Niedermayer]

On Sun, Sep 23, 2012 at 03:35:09PM +0200, Sebastien Zwickert wrote:
> ---
>  Changelog                 |    1 +
>  MAINTAINERS               |    1 +
>  configure                 |   12 +
>  libavcodec/Makefile       |    7 +
>  libavcodec/allcodecs.c    |    4 +
>  libavcodec/h264.c         |    1 +
>  libavcodec/mpeg12.c       |    3 +
>  libavcodec/mpegvideo.c    |    1 +
>  libavcodec/version.h      |    2 +-
>  libavcodec/videotoolbox.c |  560 +++++++++++++++++++++++++++++++++++++++++++++
>  libavcodec/videotoolbox.h |  128 +++++++++++
>  libavutil/pixdesc.c       |    6 +
>  libavutil/pixfmt.h        |    1 +
>  13 files changed, 726 insertions(+), 1 deletion(-)
>  create mode 100644 libavcodec/videotoolbox.c
>  create mode 100644 libavcodec/videotoolbox.h

It seems ive forgotten about this patch and it seems it doesnt apply
cleanly anymore: (can you rebase (and restest) it ?)


Applying: hwaccel: add VideoToolbox support.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging libavutil/pixfmt.h
CONFLICT (content): Merge conflict in libavutil/pixfmt.h
Auto-merging libavutil/pixdesc.c
CONFLICT (content): Merge conflict in libavutil/pixdesc.c
Auto-merging libavcodec/version.h
CONFLICT (content): Merge conflict in libavcodec/version.h
Auto-merging libavcodec/mpegvideo.c
CONFLICT (content): Merge conflict in libavcodec/mpegvideo.c
Auto-merging libavcodec/mpeg12.c
CONFLICT (content): Merge conflict in libavcodec/mpeg12.c
Auto-merging libavcodec/h264.c
CONFLICT (content): Merge conflict in libavcodec/h264.c
Auto-merging libavcodec/allcodecs.c
CONFLICT (content): Merge conflict in libavcodec/allcodecs.c
Auto-merging libavcodec/Makefile
CONFLICT (content): Merge conflict in libavcodec/Makefile
Auto-merging configure
CONFLICT (content): Merge conflict in configure
Auto-merging MAINTAINERS
Auto-merging Changelog
CONFLICT (content): Merge conflict in Changelog
Failed to merge in the changes.
Patch failed at 0001 hwaccel: add VideoToolbox support.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

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

Those who are too smart to engage in politics are punished by being
governed by those who are dumber. -- Plato 
-------------- 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/20130211/3a92f478/attachment.asc>