mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-02 03:06:28 +02: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>
57 lines
776 B
Plaintext
57 lines
776 B
Plaintext
.config
|
|
.version
|
|
*.o
|
|
*.d
|
|
*.exe
|
|
*.ho
|
|
*-example
|
|
*-test
|
|
*_g
|
|
*.def
|
|
*.dll
|
|
*.lib
|
|
*.exp
|
|
config.*
|
|
doc/*.1
|
|
doc/*.html
|
|
doc/*.pod
|
|
doc/fate.txt
|
|
doxy
|
|
ffmpeg
|
|
ffplay
|
|
ffprobe
|
|
ffserver
|
|
avconv
|
|
libavcodec/*_tablegen
|
|
libavcodec/*_tables.c
|
|
libavcodec/*_tables.h
|
|
libavcodec/codec_names.h
|
|
libavcodec/libavcodec*
|
|
libavcore/libavcore*
|
|
libavdevice/libavdevice*
|
|
libavfilter/libavfilter*
|
|
libavformat/libavformat*
|
|
libavutil/avconfig.h
|
|
libavutil/libavutil*
|
|
libpostproc/libpostproc*
|
|
libswresample/libswresample*
|
|
libswscale/libswscale*
|
|
tests/audiogen
|
|
tests/base64
|
|
tests/data
|
|
tests/rotozoom
|
|
tests/tiny_psnr
|
|
tests/videogen
|
|
tests/vsynth1
|
|
tests/vsynth2
|
|
tools/aviocat
|
|
tools/cws2fws
|
|
tools/graph2dot
|
|
tools/ismindex
|
|
tools/lavfi-showfiltfmts
|
|
tools/pktdumper
|
|
tools/probetest
|
|
tools/qt-faststart
|
|
tools/trasher
|
|
version.h
|