diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-24 02:21:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-24 02:22:00 +0100 |
| commit | 15cfc6c97d403d06cf6ea0bc6ba5eb8e493857c2 (patch) | |
| tree | f3d57dc90278d091cce239696f810123c155a3eb /libavcodec | |
| parent | 4940d1c0aec9223d92aeead551492c81c18d8c60 (diff) | |
| parent | b4eafa8b04802f45a710e712f2ec2676e0a77024 (diff) | |
| download | ffmpeg-15cfc6c97d403d06cf6ea0bc6ba5eb8e493857c2.tar.gz | |
Merge remote-tracking branch 'newdev/release/0.6' into release/0.6
* newdev/release/0.6:
Support writing 2d float arrays.
Add missing dependencies for the AAC-HE backport for hardcoded tables
configure: Add the -D parameter to the dlltool command
Set the correct target for mingw64 dlltool
configure: use dlltools instead of lib.exe
release notes and changelog for 0.6.2
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/tableprint.c | 1 | ||||
| -rw-r--r-- | libavcodec/tableprint.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4547ef60ca..3dd24e7e12 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -645,7 +645,9 @@ $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF) $(M)./$< > $@ ifdef CONFIG_HARDCODED_TABLES -$(SUBDIR)aac.o: $(SUBDIR)cbrt_tables.h +$(SUBDIR)aacdec.o: $(SUBDIR)cbrt_tables.h +$(SUBDIR)aacps.o: $(SUBDIR)aacps_tables.h +$(SUBDIR)aactab.o: $(SUBDIR)aac_tables.h $(SUBDIR)dv.o: $(SUBDIR)dv_tables.h $(SUBDIR)mdct.o: $(SUBDIR)mdct_tables.h $(SUBDIR)mpegaudiodec.o: $(SUBDIR)mpegaudio_tables.h diff --git a/libavcodec/tableprint.c b/libavcodec/tableprint.c index e39606bb15..0f422eb888 100644 --- a/libavcodec/tableprint.c +++ b/libavcodec/tableprint.c @@ -33,6 +33,7 @@ WRITE_1D_FUNC(float, float, "%.18e", 3) WRITE_2D_FUNC(int8, int8_t) WRITE_2D_FUNC(uint8, uint8_t) WRITE_2D_FUNC(uint32, uint32_t) +WRITE_2D_FUNC(float, float) void write_fileheader(void) { printf("/* This file was generated by libavcodec/tableprint */\n"); diff --git a/libavcodec/tableprint.h b/libavcodec/tableprint.h index d81af97e95..76ab8028b5 100644 --- a/libavcodec/tableprint.h +++ b/libavcodec/tableprint.h @@ -66,6 +66,7 @@ void write_float_array (const float *, int); void write_int8_2d_array (const void *, int, int); void write_uint8_2d_array (const void *, int, int); void write_uint32_2d_array(const void *, int, int); +void write_float_2d_array (const void *, int, int); /** \} */ // end of printfuncs group /** Write a standard file header */ |