Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Dec 2012 07:24:45 +0000 (08:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Dec 2012 07:24:45 +0000 (08:24 +0100)
* qatar/master:
  build: fix 'clean' target
  ZeroCodec: Flip output

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
Makefile
common.mak
libavcodec/version.h
library.mak

diff --cc Makefile
+++ b/Makefile
@@@ -151,12 -185,9 +151,11 @@@ uninstall-data
        $(RM) -r "$(DATADIR)"
  
  clean::
 -      $(RM) $(ALLPROGS)
 +      $(RM) $(ALLPROGS) $(ALLPROGS_G)
        $(RM) $(CLEANSUFFIXES)
-       $(RM) $(TOOLS)
        $(RM) $(CLEANSUFFIXES:%=tools/%)
 +      $(RM) coverage.info
 +      $(RM) -r coverage-html
  
  distclean::
        $(RM) $(DISTCLEANSUFFIXES)
diff --cc common.mak
Simple merge
   * Libavcodec version macros.
   */
  
 +#include "libavutil/avutil.h"
 +
  #define LIBAVCODEC_VERSION_MAJOR 54
 -#define LIBAVCODEC_VERSION_MINOR 34
 -#define LIBAVCODEC_VERSION_MICRO  1
 +#define LIBAVCODEC_VERSION_MINOR 79
- #define LIBAVCODEC_VERSION_MICRO 101
++#define LIBAVCODEC_VERSION_MICRO 102
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \
diff --cc library.mak
@@@ -56,13 -56,9 +56,13 @@@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS
        $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
        $(SLIB_EXTRA_CMD)
  
 +ifdef SUBDIR
 +$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
 +endif
 +
  clean::
        $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
-           $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(HOSTOBJS) $(HOSTPROGS)
+           $(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
  
  distclean:: clean
        $(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)