Merge remote-tracking branch 'qatar/master'

This early morning merge should fix --disable-yasm * qatar/master: Clean up #includes in cmdutils.h. g729: Merge g729.h into g729dec.c. 10l: wrap float_interleave functions in HAVE_YASM. Conflicts: libavcodec/g729.h

Michael Niedermayer committed 15 years ago

Commit 3c7650a2 parents 75a37b5 ea91e774 files · +15 −36Browse files

Unified · Split

4 files

cmdutils.h +3 −6
libavcodec/g729.h +0 −29
libavcodec/g729dec.c +6 −1
libavcodec/x86/fmtconvert_mmx.c +6 −0

cmdutils.h+3−6

 #ifndef FFMPEG_CMDUTILS_H
 #define FFMPEG_CMDUTILS_H
-#include <inttypes.h>
+#include <stdint.h>
 #include "libavcodec/avcodec.h"
+#include "libavfilter/avfilter.h"
 #include "libavformat/avformat.h"
 #include "libswscale/swscale.h"
 FILE *get_preset_file(char *filename, size_t filename_size,
                       const char *preset_name, int is_path, const char *codec_name);
-#if CONFIG_AVFILTER
-#include "libavfilter/avfilter.h"
 typedef struct {
     enum PixelFormat pix_fmt;
 } FFSinkContext;
 int get_filtered_video_frame(AVFilterContext *sink, AVFrame *frame,
                              AVFilterBufferRef **picref, AVRational *pts_tb);
-#endif /* CONFIG_AVFILTER */
 #endif /* FFMPEG_CMDUTILS_H */

libavcodec/g729.h+0−29

@@ -1,29 +0,0 @@
1	/*
2	* G.729 decoder
3	* Copyright (c) 2008 Vladimir Voroshilov
4	*
5	* This file is part of FFmpeg.
6	*
7	* FFmpeg is free software; you can redistribute it and/or
8	* modify it under the terms of the GNU Lesser General Public
9	* License as published by the Free Software Foundation; either
10	* version 2.1 of the License, or (at your option) any later version.
11	*
12	* FFmpeg is distributed in the hope that it will be useful,
13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15	* Lesser General Public License for more details.
16	*
17	* You should have received a copy of the GNU Lesser General Public
18	* License along with FFmpeg; if not, write to the Free Software
19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	*/
21	#ifndef AVCODEC_G729_H
22	#define AVCODEC_G729_H
23
24	/**
25	* subframe size
26	*/
27	#define SUBFRAME_SIZE 40
28
29	#endif // AVCODEC_G729_H

libavcodec/g729dec.c+6−1

 #include "libavutil/avutil.h"
 #include "get_bits.h"
-#include "g729.h"
 #include "lsp.h"
 #include "celp_math.h"
 #include "acelp_filters.h"
  */
 #define SHARP_MAX                  13017
+/**
+ * subframe size
+ */
+#define SUBFRAME_SIZE              40
 typedef struct {
     uint8_t ac_index_bits[2];   ///< adaptive codebook index for second subframe (size in bits)
     uint8_t parity_bit;         ///< parity bit for pitch delay

libavcodec/x86/fmtconvert_mmx.c+6−0

         float_to_int16_interleave_3dnow(dst, src, len, channels);
 }
+#if HAVE_YASM
 void ff_float_interleave2_mmx(float *dst, const float **src, unsigned int len);
 void ff_float_interleave2_sse(float *dst, const float **src, unsigned int len);
     else
         ff_float_interleave_c(dst, src, len, channels);
 }
+#endif
 void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx)
 {
     int mm_flags = av_get_cpu_flags();
     if (mm_flags & AV_CPU_FLAG_MMX) {
+#if HAVE_YASM
         c->float_interleave = float_interleave_mmx;
+#endif
         if(mm_flags & AV_CPU_FLAG_3DNOW){
             if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
             c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse;
             c->float_to_int16 = float_to_int16_sse;
             c->float_to_int16_interleave = float_to_int16_interleave_sse;
+#if HAVE_YASM
             c->float_interleave = float_interleave_sse;
+#endif
         }
         if(mm_flags & AV_CPU_FLAG_SSE2){
             c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse2;

Merge remote-tracking branch 'qatar/master'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code