diff options
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/diff_to_ffmpeg_cvs.txt | 9 | ||||
| -rw-r--r-- | src/libffmpeg/libavutil/common.h | 7 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index 0b8a3946a..2e374cfd0 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -42,7 +42,7 @@ Index: libavutil/common.h =================================================================== --- libavutil/common.h (revision 7433) +++ libavutil/common.h (working copy) -@@ -345,4 +345,27 @@ +@@ -345,4 +345,20 @@ char *av_strdup(const char *s); void av_freep(void *ptr); @@ -58,13 +58,6 @@ Index: libavutil/common.h +# define always_inline +#endif + -+/* xine: define ASMALIGN here since it's cleaner that generating it in the configure */ -+#if HAVE_ASMALIGN_POT -+# define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t" -+#else -+# define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t" -+#endif -+ +/* xine: another config.h with codecs to use */ +#include "ffmpeg_config.h" + diff --git a/src/libffmpeg/libavutil/common.h b/src/libffmpeg/libavutil/common.h index 0c77aa26a..0d4346048 100644 --- a/src/libffmpeg/libavutil/common.h +++ b/src/libffmpeg/libavutil/common.h @@ -357,13 +357,6 @@ void av_freep(void *ptr); # define always_inline #endif -/* xine: define ASMALIGN here since it's cleaner that generating it in the configure */ -#if HAVE_ASMALIGN_POT -# define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t" -#else -# define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t" -#endif - /* xine: another config.h with codecs to use */ #include "ffmpeg_config.h" |