FFmpeg/libavcodec
Michael Niedermayer fa3fde168b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libvpxenc: use the default bitrate if not set
  utvideo: Rename utvideo.c to utvideodec.c
  doc: Fix syntax errors in sample Emacs config
  mjpegdec: more meaningful return values
  configure: clean up Altivec detection
  getopt: Remove an unnecessary define
  rtmp: Use int instead of ssize_t
  getopt: Add missing includes
  rtmp: Add support for receiving incoming streams
  Add missing includes for code relying on external libraries

Conflicts:
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/mjpegdec.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-17 17:06:52 +02:00
..
2012-08-09 00:02:05 +00:00
2012-08-15 22:32:06 +03:00
2012-08-14 18:58:49 +02:00
2012-08-08 01:14:18 +02:00
2012-08-12 15:21:15 -04:00
2012-08-07 23:57:21 +02:00
2012-08-09 11:22:11 +02:00
2012-08-15 22:32:06 +03:00
2012-08-15 22:32:06 +03:00
2012-08-13 04:58:15 +02:00
2012-08-09 10:50:27 +02:00
2012-08-07 22:56:35 +00:00
2012-08-15 05:29:28 +02:00
2012-08-15 22:32:06 +03:00
2012-08-12 05:32:07 +02:00
2012-08-11 05:32:16 +02:00
2012-08-16 02:57:11 +02:00
2012-08-14 21:22:20 +02:00