mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
184fc600e1
* qatar/master: mpegvideo_enc: only allocate output packet when we know there will be output Add names for more channel layouts to the channel layout map. sunrast: Add a sample request for RMP_RAW colormap. avcodec: do not override pts or duration from the audio encoder Add prores regression test. Enable already existing rso regression test. Add regression test for "sox" format muxer/demuxer. Add dpx encoding regression test. swscale: K&R formatting cosmetics for PowerPC code (part I/II) img2: Use ff_guess_image2_codec(filename) shorthand where appropriate. Clarify licensing information about files borrowed from libjpeg. Mark mutable static data const where appropriate. avplay: fix -threads option dvbsubdec: avoid undefined signed left shift in RGBA macro mlpdec: use av_log_ask_for_sample() gif: K&R formatting cosmetics png: make .long_name more descriptive movdec: Adjust keyframe flagging in fragmented files rv34: change most "int stride" into "ptrdiff_t stride". Conflicts: avprobe.c ffplay.c libavcodec/mlpdec.c libavcodec/mpegvideo_enc.c libavcodec/pngenc.c libavcodec/x86/v210-init.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vf_settb.c libavformat/img2.c libavutil/audioconvert.c tests/codec-regression.sh tests/lavf-regression.sh tests/ref/lavf/dpx tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| amv | ||
| asv1 | ||
| asv2 | ||
| cljr | ||
| dnxhd_720p | ||
| dnxhd_720p_10bit | ||
| dnxhd_720p_rd | ||
| dnxhd_1080i | ||
| dv | ||
| dv50 | ||
| dv_411 | ||
| error | ||
| ffv1 | ||
| flashsv | ||
| flashsv2 | ||
| flv | ||
| h261 | ||
| h263 | ||
| h263p | ||
| huffyuv | ||
| jpeg2000 | ||
| jpegls | ||
| ljpeg | ||
| mjpeg | ||
| mpeg | ||
| mpeg1b | ||
| mpeg2 | ||
| mpeg2_422 | ||
| mpeg2_idct_int | ||
| mpeg2_ilace | ||
| mpeg2_ivlc_qprd | ||
| mpeg2thread | ||
| mpeg2thread_ilace | ||
| mpeg4 | ||
| mpeg4_adap | ||
| mpeg4_qpel | ||
| mpeg4_qprd | ||
| mpeg4adv | ||
| mpeg4nr | ||
| mpeg4thread | ||
| mpng | ||
| msmpeg4 | ||
| msmpeg4v2 | ||
| msvideo1 | ||
| prores | ||
| prores_kostya | ||
| qtrle | ||
| qtrlegray | ||
| r210 | ||
| rc | ||
| rgb | ||
| roq | ||
| rv10 | ||
| rv20 | ||
| snow | ||
| snowll | ||
| svq1 | ||
| v210 | ||
| v308 | ||
| vref | ||
| wmv1 | ||
| wmv2 | ||
| y41p | ||
| yuv | ||
| yuv4 | ||
| zlib | ||
| zmbv | ||