mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-23 07:42:51 +00:00
3bbf3f7e42
* qatar/master: matroska: Clear prev_pkt between seeks. avutil: change default buffer size alignment for sample buffer functions audemux: Add a sanity check for the number of channels Remove libdirac decoder. matroska: Add incremental parsing of clusters. avconv: fix off by one check in complex_filter mpegts: Try seeking back even for nonseekable protocols swscale: K&R formatting cosmetics (part III) Conflicts: configure doc/general.texi doc/platform.texi ffmpeg.c libavcodec/Makefile libavcodec/allcodecs.c libavcodec/libdirac.h libavcodec/libdiracdec.c libavformat/au.c libavformat/mpegts.c libswscale/input.c tests/ref/seek/lavf_mkv Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
bfin | ||
ppc | ||
sparc | ||
x86 | ||
colorspace-test.c | ||
input.c | ||
libswscale.v | ||
Makefile | ||
options.c | ||
output.c | ||
rgb2rgb_template.c | ||
rgb2rgb.c | ||
rgb2rgb.h | ||
swscale_internal.h | ||
swscale_unscaled.c | ||
swscale-test.c | ||
swscale.c | ||
swscale.h | ||
utils.c | ||
yuv2rgb.c |