mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
7b0b10ce41
* qatar/master: (25 commits) rtpenc: Add support for G726 audio rtpdec: Interpret the different G726 names as bits_per_coded_sample rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes rtpenc: Cast a rescaling parameter to int64_t h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1. ARM: fix indentation in ff_dsputil_init_neon() ARM: NEON put/avg_pixels8/16 cosmetics ARM: add remaining NEON avg_pixels8/16 functions ARM: clean up NEON put/avg_pixels macros fate: split acodec-pcm into individual tests swscale: #include "libavutil/mathematics.h" pmpdec: don't use deprecated av_set_pts_info. rv34: align temporary block of "dct" coefs Add PlayStation Portable PMP format demuxer proto: Realign struct initializers proto: Use .priv_data_size to allocate the private context mmsh: Properly clean up if the second ffurl_alloc failed rtmp: Clean up properly if the handshake failed md5proto: Remove the get_file_handle function applehttpproto: Use the close function if the open function fails ... Conflicts: libavcodec/vble.c libavformat/mmsh.c libavformat/pmpdec.c libavformat/udp.c tests/ref/acodec/pcm Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| ac3_fixed | ||
| adpcm_ima_qt | ||
| adpcm_ima_wav | ||
| adpcm_ms | ||
| adpcm_swf | ||
| adpcm_yam | ||
| alac | ||
| aref | ||
| flac | ||
| g723_1 | ||
| g726 | ||
| mp2 | ||
| pcm_alaw | ||
| pcm_f32be | ||
| pcm_f32le | ||
| pcm_f64be | ||
| pcm_f64le | ||
| pcm_mulaw | ||
| pcm_s8 | ||
| pcm_s16be | ||
| pcm_s16le | ||
| pcm_s24be | ||
| pcm_s24daud | ||
| pcm_s24le | ||
| pcm_s32be | ||
| pcm_s32le | ||
| pcm_u8 | ||
| wmav1 | ||
| wmav2 | ||