diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-18 02:20:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-18 02:20:19 +0100 |
| commit | bbb61a1cd5cb2046e480f367a7ae58a32f2ef907 (patch) | |
| tree | 0e7cc2b59558e2dc31d6b8752d90f6b5b5c886e5 /libavformat/voc.c | |
| parent | f6492476a63938cc66c51bf61c88407b7749f780 (diff) | |
| parent | af468015d972c0dec5c8c37b2685ffa5cbe4ae87 (diff) | |
| download | ffmpeg-streaming-bbb61a1cd5cb2046e480f367a7ae58a32f2ef907.zip ffmpeg-streaming-bbb61a1cd5cb2046e480f367a7ae58a32f2ef907.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
als: prevent infinite loop in zero_remaining().
cook: prevent div-by-zero if channels is zero.
pamenc: switch to encode2().
svq1enc: switch to encode2().
dvenc: switch to encode2().
dpxenc: switch to encode2().
pngenc: switch to encode2().
v210enc: switch to encode2().
xwdenc: switch to encode2().
ttadec: use branchless unsigned-to-signed unfolding
avcodec: add a Sun Rasterfile encoder
sunrast: Move common defines to a new header file.
cdxl: fix video decoding for some files
cdxl: fix audio for some samples
apetag: add proper support for binary tags
ttadec: remove dead code
swscale: make access to filter data conditional on filter type.
swscale: update context offsets after removal of AlpMmxFilter.
prores: initialise encoder and decoder parts only when needed
swscale: make monowhite/black RGB-independent.
...
Conflicts:
Changelog
libavcodec/alsdec.c
libavcodec/dpxenc.c
libavcodec/golomb.h
libavcodec/pamenc.c
libavcodec/pngenc.c
libavformat/img2.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/voc.c')
0 files changed, 0 insertions, 0 deletions
