mirror of https://git.ffmpeg.org/ffmpeg.git
7fad19a63d
* qatar/master: x86: cabac: replace explicit memory references with "m" operands avplay: don't request a stereo downmix wmapro: use av_float2int() lavc: avoid invalid memcpy() in avcodec_default_release_buffer() lavu: replace int/float punning functions lavfi: install libavfilter/vsrc_buffer.h Remove extraneous semicolons sdp: Restore the original mp4 format h264 extradata if converted rtpenc: Add support for mp4 format h264 rtpenc: Simplify code by introducing a separate end pointer movenc: Use the actual converted sample for RTP hinting Fix a bunch of common typos. Conflicts: doc/developer.texi doc/eval.texi doc/filters.texi doc/protocols.texi ffmpeg.c ffplay.c libavcodec/mpegvideo.h libavcodec/x86/cabac.h libavfilter/Makefile libavformat/avformat.h libavformat/cafdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/gxfenc.c libavformat/img2.c libavformat/movenc.c libavformat/mpegts.c libavformat/rtpenc_h264.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| alldevices.c | ||
| alsa-audio-common.c | ||
| alsa-audio-dec.c | ||
| alsa-audio-enc.c | ||
| alsa-audio.h | ||
| avdevice.c | ||
| avdevice.h | ||
| bktr.c | ||
| dshow.c | ||
| dshow.h | ||
| dshow_common.c | ||
| dshow_enummediatypes.c | ||
| dshow_enumpins.c | ||
| dshow_filter.c | ||
| dshow_pin.c | ||
| dv1394.c | ||
| dv1394.h | ||
| fbdev.c | ||
| jack_audio.c | ||
| lavfi.c | ||
| libavdevice.v | ||
| libcdio.c | ||
| libdc1394.c | ||
| openal-dec.c | ||
| oss_audio.c | ||
| pulse.c | ||
| sdl.c | ||
| sndio_common.c | ||
| sndio_common.h | ||
| sndio_dec.c | ||
| sndio_enc.c | ||
| timefilter.c | ||
| timefilter.h | ||
| v4l.c | ||
| v4l2.c | ||
| vfwcap.c | ||
| x11grab.c | ||