mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
0b9a69f244
* qatar/master: (22 commits) aacdec: Fix PS in ADTS. avconv: Consistently use PIX_FMT_NONE. dsputil: use cpuflags in x86 emu_edge_core dsputil: use movups instead of movdqu in ff_emu_edge_core_sse() wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits. mov: Remove some redundant and obsolete comments. Add libavutil/mathematics.h #includes for INFINITY doxy: structure libavformat groups doxy: introduce an empty structure in libavcodec doxy: provide a start page and document libavutil doxy: cleanup pixfmt.h regtest: split video encode/decode tests into individual targets ARM: add explicit .arch and .fpu directives to asm.S pthread: do not touch has_b_frames avconv: cleanup the transcoding loop in output_packet(). avconv: split subtitle transcoding out of output_packet(). avconv: split video transcoding out of output_packet(). avconv: split audio transcoding out of output_packet(). avconv: reindent. avconv: move streamcopy-only code out of decoding loop. ... Conflicts: avconv.c libavcodec/aaccoder.c libavcodec/pthread.c libavcodec/version.h libavutil/audioconvert.h libavutil/avutil.h libavutil/mem.h tests/ref/vsynth1/dv tests/ref/vsynth1/mpeg2thread tests/ref/vsynth2/dv tests/ref/vsynth2/mpeg2thread Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| amv | ||
| asv1 | ||
| asv2 | ||
| 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 | ||
| msmpeg4 | ||
| msmpeg4v2 | ||
| msvideo1 | ||
| prores | ||
| qtrle | ||
| qtrlegray | ||
| rc | ||
| rgb | ||
| roq | ||
| rv10 | ||
| rv20 | ||
| snow | ||
| snowll | ||
| svq1 | ||
| vref | ||
| wmv1 | ||
| wmv2 | ||
| yuv | ||