mirror of https://git.ffmpeg.org/ffmpeg.git
9e89bc37ed
* qatar/master: rtmp: Add support for SWFVerification api-example: use new video encoding API. x86: avcodec: Appropriately name files containing only init functions mpegvideo_mmx_template: drop some commented-out cruft libavresample: add mix level normalization option w32pthreads: Add missing #includes to make header compile standalone rtmp: Gracefully ignore _checkbw errors by tracking them rtmp: Do not send _checkbw calls as notifications prores: interlaced ProRes encoding Conflicts: doc/examples/decoding_encoding.c libavcodec/proresenc_kostya.c libavcodec/w32pthreads.h libavcodec/x86/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| x86 | ||
| Makefile | ||
| audio_convert.c | ||
| audio_convert.h | ||
| audio_data.c | ||
| audio_data.h | ||
| audio_mix.c | ||
| audio_mix.h | ||
| audio_mix_matrix.c | ||
| avresample-test.c | ||
| avresample.h | ||
| internal.h | ||
| libavresample.v | ||
| options.c | ||
| resample.c | ||
| resample.h | ||
| resample_template.c | ||
| utils.c | ||
| version.h | ||