Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jul 2012 23:27:19 +0000 (01:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jul 2012 23:27:19 +0000 (01:27 +0200)
commit56ae5926f739bd26a5aa4add98604b7cd3c2d6ca
treebd21824c32a6018f28d2e3c2c1d810ad77a3d1c5
parentd4838675253513504c4e0d0ed92489b3c4e6cf8d
parent453c02f971fc7865dea396731accbcd7ab6d3728
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopenjpeg: introduce encoding support
  libopenjpeg: rename decoder source file.
  RTMPTS protocol support
  RTMPS protocol support
  avconv: print an error message when demuxing fails.
  tscc2: DCT output should not be clipped
  rtmp: Rename rtmphttp to ffrtmphttp

Conflicts:
Changelog
configure
doc/general.texi
libavcodec/libopenjpegenc.c
libavcodec/version.h
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
Changelog
configure
doc/general.texi
doc/protocols.texi
ffmpeg.c
libavcodec/libopenjpegenc.c
libavcodec/tscc2.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/rtmp.h
libavformat/rtmphttp.c
libavformat/rtmpproto.c
libavformat/version.h