Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Jul 2011 03:33:39 +0000 (05:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Jul 2011 03:35:26 +0000 (05:35 +0200)
* qatar/master:
  cosmetics: fix some then/than typos
  doxygen: Include libavcodec and libavformat examples into the documentation
  avutil: elaborate documentation for av_get_random_seed
  Add support for aac streams in mp4/mov without extradata.
  aes: whitespace cosmetics
  adler32: whitespace cosmetics
  swscale: fix another yuv range conversion overflow in 16bit scaling.
  Fix cpu flags test program
  opt-test: Add missing braces to silence compiler warnings.
  build: Eliminate obsolete test targets.
  udp: Fix a compilation warning
  swscale: Unbreak build with --enable-small
  base64: add fate test
  aes: improve test program and add fate test
  adler32: make test program more useful and add fate test
  swscale: fix yuv range correction when using 16-bit scaling.
  aacenc: Make chan_map const correct

Conflicts:
Makefile
doc/examples/muxing-example.c
libavformat/udp.c
libavutil/random_seed.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
19 files changed:
1  2 
Doxyfile
Makefile
doc/examples/encoding-example.c
doc/examples/muxing-example.c
libavcodec/aacdec.c
libavcodec/aacenc.h
libavcodec/avcodec.h
libavcodec/dca.c
libavcodec/dsputil.h
libavcodec/get_bits.h
libavcodec/mpegvideo_enc.c
libavcodec/pgssubdec.c
libavformat/udp.c
libavformat/utils.c
libavutil/aes.c
libavutil/cpu.c
libavutil/opt.c
libswscale/swscale.c
tests/fate2.mak

diff --cc Doxyfile
Simple merge
diff --cc Makefile
+++ b/Makefile
@@@ -148,10 -183,8 +148,8 @@@ distclean:
        $(RM) config.* .version version.h libavutil/avconfig.h
  
  config:
 -      $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)
 +      $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
  
- check: test
  include $(SRC_PATH)/doc/Makefile
  include $(SRC_PATH)/tests/Makefile
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc libavutil/aes.c
Simple merge
diff --cc libavutil/cpu.c
Simple merge
diff --cc libavutil/opt.c
Simple merge
Simple merge
diff --cc tests/fate2.mak
Simple merge