mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-19 14:00:43 +00:00
3c5fe5b527
* qatar/master: (22 commits) wma: Clip WMA1 and WMA2 frame length to 11 bits. movenc: Don't require frame_size to be set for modes other than mov doc: Update APIchanges with info on muxer flushing movenc: Reindent a block tools: Remove some unnecessary #undefs. rv20: prevent calling ff_h263_decode_mba() with unset height/width tools: K&R reformatting cosmetics Ignore generated aviocat and ismindex tools. build: Automatically include architecture-specific library Makefile snippets. indeo5: prevent null pointer dereference on broken files pktdumper: Use usleep instead of sleep cosmetics: Remove some unnecessary block braces. Drop unnecessary prefix from *sink* variable and struct names. Add a tool for creating smooth streaming manifests movdec: Calculate an average bit rate for fragmented streams, too movenc: Write the sample rate instead of time scale in the stsd atom movenc: Add a separate ismv/isma (smooth streaming) muxer movenc: Allow the caller to decide on fragmentation libavformat: Add a flag for muxers that support write_packet(NULL) for flushing movenc: Add support for writing fragmented mov files ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges ffmpeg.c ffplay.c libavfilter/Makefile libavformat/Makefile libavformat/avformat.h libavformat/movenc.c libavformat/movenc.h libavformat/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| libmpcodecs | ||
| x86 | ||
| af_aconvert_rematrix.c | ||
| af_aconvert.c | ||
| af_aformat.c | ||
| af_amerge.c | ||
| af_anull.c | ||
| af_aresample.c | ||
| af_ashowinfo.c | ||
| af_asplit.c | ||
| af_astreamsync.c | ||
| af_earwax.c | ||
| af_pan.c | ||
| af_silencedetect.c | ||
| af_volume.c | ||
| all_channel_layouts.h | ||
| allfilters.c | ||
| asink_anullsink.c | ||
| asrc_abuffer.c | ||
| asrc_abuffer.h | ||
| asrc_aevalsrc.c | ||
| asrc_anullsrc.c | ||
| avcodec.c | ||
| avcodec.h | ||
| avfilter.c | ||
| avfilter.h | ||
| avfiltergraph.c | ||
| avfiltergraph.h | ||
| buffersink.h | ||
| buffersrc.h | ||
| defaults.c | ||
| drawutils.c | ||
| drawutils.h | ||
| formats.c | ||
| gradfun.h | ||
| graphdump.c | ||
| graphparser.c | ||
| internal.h | ||
| libavfilter.v | ||
| Makefile | ||
| sink_buffer.c | ||
| src_movie.c | ||
| transform.c | ||
| transform.h | ||
| version.h | ||
| vf_aspect.c | ||
| vf_ass.c | ||
| vf_blackframe.c | ||
| vf_boxblur.c | ||
| vf_copy.c | ||
| vf_crop.c | ||
| vf_cropdetect.c | ||
| vf_delogo.c | ||
| vf_deshake.c | ||
| vf_drawbox.c | ||
| vf_drawtext.c | ||
| vf_fade.c | ||
| vf_fieldorder.c | ||
| vf_fifo.c | ||
| vf_format.c | ||
| vf_frei0r.c | ||
| vf_gradfun.c | ||
| vf_hflip.c | ||
| vf_hqdn3d.c | ||
| vf_libopencv.c | ||
| vf_lut.c | ||
| vf_mp.c | ||
| vf_null.c | ||
| vf_overlay.c | ||
| vf_pad.c | ||
| vf_pixdesctest.c | ||
| vf_scale.c | ||
| vf_select.c | ||
| vf_setpts.c | ||
| vf_settb.c | ||
| vf_showinfo.c | ||
| vf_slicify.c | ||
| vf_split.c | ||
| vf_thumbnail.c | ||
| vf_tinterlace.c | ||
| vf_transpose.c | ||
| vf_unsharp.c | ||
| vf_vflip.c | ||
| vf_yadif.c | ||
| vsink_nullsink.c | ||
| vsrc_buffer.c | ||
| vsrc_buffer.h | ||
| vsrc_cellauto.c | ||
| vsrc_color.c | ||
| vsrc_life.c | ||
| vsrc_mandelbrot.c | ||
| vsrc_mptestsrc.c | ||
| vsrc_testsrc.c | ||
| yadif.h | ||