mirror of https://git.ffmpeg.org/ffmpeg.git
e37f161e66
* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| aiff | ||
| alaw | ||
| asf | ||
| au | ||
| avi | ||
| bmp | ||
| caf | ||
| dpx | ||
| dv_fmt | ||
| ffm | ||
| flv_fmt | ||
| gif | ||
| gxf | ||
| jpg | ||
| mkv | ||
| mmf | ||
| mov | ||
| mpg | ||
| mulaw | ||
| mxf | ||
| mxf_d10 | ||
| nut | ||
| ogg | ||
| pbmpipe | ||
| pcx | ||
| pgm | ||
| pgmpipe | ||
| pixfmt | ||
| png | ||
| ppm | ||
| ppmpipe | ||
| rm | ||
| rso | ||
| sgi | ||
| sox | ||
| swf | ||
| tga | ||
| tiff | ||
| ts | ||
| voc | ||
| voc_s16 | ||
| wav | ||
| wtv | ||
| xwd | ||
| yuv4mpeg | ||