Merge the avutil branch; port the "raw" video output plugin.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c
rename : src/combined/ffmpeg/ffmpeg_encoder.c => src/dxr3/ffmpeg_encoder.c

1 files changed, 0 insertions, 29 deletions

diff --git a/contrib/ffmpeg/libavformat/asfcrypt.h b/contrib/ffmpeg/libavformat/asfcrypt.h
deleted file mode 100644
index dcd9c1da7..000000000
--- a/contrib/ffmpeg/libavformat/asfcrypt.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * ASF decryption
- * Copyright (c) 2007 Reimar Doeffinger
- *
- * 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.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef FFMPEG_ASFCRYPT_H
-#define FFMPEG_ASFCRYPT_H
-
-#include <inttypes.h>
-
-void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len);
-
-#endif /* FFMPEG_ASFCRYPT_H */