1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer 721be99371 Merge remote-tracking branch 'qatar/master'
* 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>
2011-07-01 05:35:26 +02:00
..
2011-06-21 03:06:54 +02:00
2011-06-29 10:07:39 +02:00
2011-06-02 20:06:00 +01:00
2011-06-02 20:06:00 +01:00
2011-06-10 22:13:26 +02:00
2011-05-24 19:10:28 +02:00
2011-06-19 03:54:15 +02:00
2011-06-29 10:07:39 +02:00
2011-05-25 11:29:47 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-06-15 10:57:26 +02:00
2011-06-07 18:22:53 +02:00
2011-06-21 04:45:29 +02:00
2011-06-15 01:16:58 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-06-20 21:03:59 +02:00
2011-06-27 10:03:21 +02:00
2011-06-02 20:06:00 +01:00
2011-06-21 13:17:10 +02:00
2011-06-02 20:06:00 +01:00