diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-18 01:27:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-18 01:27:19 +0200 |
| commit | 56ae5926f739bd26a5aa4add98604b7cd3c2d6ca (patch) | |
| tree | bd21824c32a6018f28d2e3c2c1d810ad77a3d1c5 /libswscale/input.c | |
| parent | d4838675253513504c4e0d0ed92489b3c4e6cf8d (diff) | |
| parent | 453c02f971fc7865dea396731accbcd7ab6d3728 (diff) | |
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>
Diffstat (limited to 'libswscale/input.c')
0 files changed, 0 insertions, 0 deletions