mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
9621646eb3
* qatar/master:
x86: dsputil: prettyprint gcc inline asm
x86: K&R prettyprinting cosmetics for dsputil_mmx.c
x86: conditionally compile H.264 QPEL optimizations
dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
Ignore generated files below doc/.
dpcm: convert to bytestream2.
interplayvideo: convert to bytestream2.
movenc: Merge if statements
h264: fix memleak in error path.
pthread: Immediately release all frames in ff_thread_flush()
h264: Add check for invalid chroma_format_idc
utvideo: port header reading to bytestream2.
Conflicts:
.gitignore
configure
libavcodec/h264_ps.c
libavcodec/interplayvideo.c
libavcodec/pthread.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
60 lines
845 B
Plaintext
60 lines
845 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
|
|
doc/avoptions_codec.texi
|
|
doc/avoptions_format.texi
|
|
doc/print_options
|
|
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
|