mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-27 18:02:11 +00:00
b4178a3f13
* qatar/master: rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream. av_samples_fill_array: Mark unmodified function argument as const. lagarith: add YUY2 decoding support Support decoding unaligned rgb24 lagarith. dv: Split profile handling code into a separate file. flvenc: use AVFormatContext, not AVCodecContext for logging. mov: Remove write-only variable in mov_read_chan(). fate: Change the probe-format refs to match the final text format committed. fate: Add avprobe as a make dependency Add probe fate tests to test for regressions in detecting media types. fate: Add oneline comparison method qdm2: clip array indices returned by qdm2_get_vlc(). avplay: properly close/reopen AVAudioResampleContext on channel layout change avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2() avcodec: for audio encoding, reset output packet when it is not valid avcodec: refactor avcodec_encode_audio2() to merge common branches avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2() Conflicts: ffplay.c libavcodec/Makefile libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/qdm2.c libavcodec/utils.c libavformat/flvenc.c libavformat/mov.c tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
fate | ||
ref | ||
asynth1.sw | ||
audiogen.c | ||
base64.c | ||
codec-regression.sh | ||
copycooker.sh | ||
fate_config.sh.template | ||
fate-run.sh | ||
fate-update.sh | ||
fate-valgrind.supp | ||
fate.sh | ||
ffserver-regression.sh | ||
ffserver.conf | ||
ffserver.regression.ref | ||
lavf-regression.sh | ||
lavfi-regression.sh | ||
lena.pnm | ||
Makefile | ||
md5.sh | ||
regression-funcs.sh | ||
rotozoom.c | ||
tiny_psnr.c | ||
utils.c | ||
videogen.c |