mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
b479e01612
* qatar/master:
Revert "v210enc: use FFALIGN()"
doxygen: Do not include license boilerplates in Doxygen comment blocks.
avplay: reset decoder flush state when seeking
ape: skip packets with invalid size
ape: calculate final packet size instead of guessing
ape: stop reading after the last frame has been read
ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
ape: return error if seeking to the current packet fails in ape_read_packet()
avcodec: Clarify AVFrame member documentation.
v210dec: check for coded_frame allocation failure
v210enc: use stride as it is already calculated
v210enc: use FFALIGN()
v210enc: return proper AVERROR codes instead of -1
v210enc: do not set coded_frame->key_frame
v210enc: check for coded_frame allocation failure
drawtext: add 'fix_bounds' option on coords fixing
drawtext: fix text_{w, h} expression vars
drawtext: add missing braces around an if() block.
Conflicts:
libavcodec/arm/vp8.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/v210dec.c
libavfilter/vf_drawtext.c
libavformat/ape.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
||
|---|---|---|
| .. | ||
| doxy | ||
| examples | ||
| APIchanges | ||
| avtools-common-opts.texi | ||
| avutil.txt | ||
| bitstream_filters.texi | ||
| build_system.txt | ||
| decoders.texi | ||
| demuxers.texi | ||
| developer.texi | ||
| encoders.texi | ||
| errno.txt | ||
| eval.texi | ||
| faq.texi | ||
| fate.texi | ||
| ffmpeg-mt-authorship.txt | ||
| ffmpeg.texi | ||
| ffmpeg.txt | ||
| ffplay.texi | ||
| ffprobe.texi | ||
| ffprobe.xsd | ||
| ffserver.conf | ||
| ffserver.texi | ||
| filters.texi | ||
| general.texi | ||
| git-howto.texi | ||
| git-howto.txt | ||
| indevs.texi | ||
| issue_tracker.txt | ||
| libavfilter.texi | ||
| Makefile | ||
| metadata.texi | ||
| multithreading.txt | ||
| muxers.texi | ||
| optimization.txt | ||
| outdevs.texi | ||
| platform.texi | ||
| protocols.texi | ||
| rate_distortion.txt | ||
| RELEASE_NOTES | ||
| snow.txt | ||
| soc.txt | ||
| swresample.txt | ||
| swscale.txt | ||
| t2h.init | ||
| tablegen.txt | ||
| texi2pod.pl | ||
| viterbi.txt | ||