patched ffmpeg nov 2

patches/to_upstream/15_webp_ffmpeg.patch

-diff -rpu -N orig/libavformat/Makefile ffmpeg-mt/libavformat/Makefile
---- orig/libavformat/Makefile   2010-10-21 12:02:06 -0700
-+++ ffmpeg-mt/libavformat/Makefile      2010-10-21 12:03:27 -0700
-@@ -283,6 +283,8 @@ OBJS-$(CONFIG_WC3_DEMUXER)              
+diff -wurp -N orig/libavformat/Makefile ffmpeg-mt/libavformat/Makefile
+--- orig/libavformat/Makefile   2010-11-04 08:10:25 -0700
++++ ffmpeg-mt/libavformat/Makefile      2010-11-04 08:10:29 -0700
+@@ -284,6 +284,8 @@ OBJS-$(CONFIG_WC3_DEMUXER)
  OBJS-$(CONFIG_WEBM_MUXER)                += matroskaenc.o matroska.o \
                                              riff.o isom.o avc.o \
                                              flacenc_header.o
 +OBJS-$(CONFIG_WEBP_DEMUXER)              += webpdec.o webp.o
 +OBJS-$(CONFIG_WEBP_MUXER)                += webpenc.o webp.o
  OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o
  OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.o
  OBJS-$(CONFIG_WV_DEMUXER)                += wv.o apetag.o
-diff -rpu -N orig/libavformat/Makefile~ ffmpeg-mt/libavformat/Makefile~
+diff -wurp -N orig/libavformat/Makefile~ ffmpeg-mt/libavformat/Makefile~
 --- orig/libavformat/Makefile~  1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/Makefile~     2010-10-21 11:59:57 -0700
++++ ffmpeg-mt/libavformat/Makefile~     2010-11-04 08:10:29 -0700
 @@ -0,0 +1,327 @@
 +include $(SUBDIR)../config.mak
 +
 +NAME = avformat
 +FFLIBS = avcodec avcore avutil
 +
 +HEADERS = avformat.h avio.h
 +
 +OBJS = allformats.o         \
 +       cutils.o             \
@@ skipping 308 matching lines @@
 +
 +# libavdevice dependencies
 +OBJS-$(CONFIG_JACK_INDEV)                += timefilter.o
 +
 +EXAMPLES  = output
 +TESTPROGS = timefilter
 +
 +include $(SUBDIR)../subdir.mak
 +
 +$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
-diff -rpu -N orig/libavformat/allformats.c ffmpeg-mt/libavformat/allformats.c
---- orig/libavformat/allformats.c       2010-10-21 12:02:05 -0700
-+++ ffmpeg-mt/libavformat/allformats.c  2010-10-21 12:03:27 -0700
+diff -wurp -N orig/libavformat/allformats.c ffmpeg-mt/libavformat/allformats.c
+--- orig/libavformat/allformats.c       2010-11-04 08:10:25 -0700
++++ ffmpeg-mt/libavformat/allformats.c  2010-11-04 08:10:29 -0700
 @@ -215,6 +215,7 @@ void av_register_all(void)
      REGISTER_MUXDEMUX (WAV, wav);
      REGISTER_DEMUXER  (WC3, wc3);
      REGISTER_MUXER    (WEBM, webm);
 +    REGISTER_MUXDEMUX (WEBP, webp);
      REGISTER_DEMUXER  (WSAUD, wsaud);
      REGISTER_DEMUXER  (WSVQA, wsvqa);
      REGISTER_DEMUXER  (WV, wv);
-diff -rpu -N orig/libavformat/webp.c ffmpeg-mt/libavformat/webp.c
+diff -wurp -N orig/libavformat/webp.c ffmpeg-mt/libavformat/webp.c
 --- orig/libavformat/webp.c     1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/webp.c        2010-10-21 12:03:27 -0700
++++ ffmpeg-mt/libavformat/webp.c        2010-11-04 08:10:29 -0700
 @@ -0,0 +1,34 @@
 +/*
 + * Copyright (c) 2010, Google, Inc.
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
@@ skipping 15 matching lines @@
 +
 +#include "webp.h"
 +
 +const AVMetadataConv ff_webp_metadata_conv[] = {
 +    { "IART", "artist" },
 +    { "ICOP", "copyright" },
 +    { "INAM", "title" },
 +    { "ICMT", "comment" },
 +    { 0 }
 +};
-diff -rpu -N orig/libavformat/webp.h ffmpeg-mt/libavformat/webp.h
+diff -wurp -N orig/libavformat/webp.h ffmpeg-mt/libavformat/webp.h
 --- orig/libavformat/webp.h     1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/webp.h        2010-10-21 12:03:27 -0700
++++ ffmpeg-mt/libavformat/webp.h        2010-11-04 08:10:29 -0700
 @@ -0,0 +1,35 @@
 +/*
 + * Copyright (c) 2010, Google, Inc.
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
@@ skipping 16 matching lines @@
 +#ifndef AVFORMAT_WEBP_H
 +#define AVFORMAT_WEBP_H
 +
 +#include "avformat.h"
 +#include "riff.h"
 +#include "metadata.h"
 +
 +extern const AVMetadataConv ff_webp_metadata_conv[];
 +
 +#endif /* AVFORMAT_WEBP_H */
-diff -rpu -N orig/libavformat/webpdec.c ffmpeg-mt/libavformat/webpdec.c
+diff -wurp -N orig/libavformat/webpdec.c ffmpeg-mt/libavformat/webpdec.c
 --- orig/libavformat/webpdec.c  1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/webpdec.c     2010-10-21 12:03:27 -0700
++++ ffmpeg-mt/libavformat/webpdec.c     2010-11-04 08:10:29 -0700
 @@ -0,0 +1,132 @@
 +/*
 + * Copyright (c) 2010, Google, Inc.
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
@@ skipping 113 matching lines @@
 +    .priv_data_size = 0,
 +    .read_probe     = probe,
 +    .read_header    = read_header,
 +    .read_packet    = read_packet,
 +    .read_close     = read_close,
 +    .flags          = AVFMT_GENERIC_INDEX,
 +    .extensions     = "webp",
 +    .value          = CODEC_ID_VP8,
 +    .codec_tag      = (const AVCodecTag*[]){webp_codec_tags, 0},
 +};
-diff -rpu -N orig/libavformat/webpenc.c ffmpeg-mt/libavformat/webpenc.c
+diff -wurp -N orig/libavformat/webpenc.c ffmpeg-mt/libavformat/webpenc.c
 --- orig/libavformat/webpenc.c  1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavformat/webpenc.c     2010-10-21 12:03:27 -0700
++++ ffmpeg-mt/libavformat/webpenc.c     2010-11-04 08:10:29 -0700
 @@ -0,0 +1,123 @@
 +/*
 + * Copyright (c) 2010, Google, Inc.
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
@@ skipping 104 matching lines @@
 +    .long_name      = NULL_IF_CONFIG_SMALL("WebP"),
 +    .mime_type      = "image/webp",
 +    .extensions     = "webp",
 +    .priv_data_size = sizeof(WEBPContext),
 +    .audio_codec    = CODEC_ID_NONE,
 +    .video_codec    = CODEC_ID_VP8,
 +    .write_header   = write_header,
 +    .write_packet   = write_packet,
 +    .write_trailer  = write_trailer,
 +};