Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Aug 2012 15:06:07 +0000 (17:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Aug 2012 15:06:52 +0000 (17:06 +0200)
commitfa3fde168b8c3d2d7c008a98457832575dbf9fe0
tree44ac6dc9bc226deb2310c4ba901c28e202c777fa
parent517a2bbcf131df3e61ff4494d7f695b4570bc5fc
parent4aa3d7b3f2b71296d73276d62be4e806b34d2d01
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>
16 files changed:
compat/getopt.c
configure
doc/developer.texi
doc/protocols.texi
libavcodec/Makefile
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libschroedinger.c
libavcodec/libschroedingerdec.c
libavcodec/libxavs.c
libavcodec/mjpegdec.c
libavcodec/utvideodec.c
libavfilter/vf_frei0r.c
libavfilter/vf_libopencv.c
libavformat/rtmpproto.c
libavformat/version.h