mirror of https://git.ffmpeg.org/ffmpeg.git
5163fb9446
* commit '8a06794112d02a5707f766b8b38a5d50dfd03898': mpeg2: add sequence display extension information Conflicts: libavcodec/mpeg12enc.c tests/ref/lavf/gxf tests/ref/lavf/mxf tests/ref/lavf/mxf_d10 tests/ref/lavf/ts tests/ref/seek/lavf-gxf tests/ref/seek/lavf-mxf tests/ref/seek/lavf-ts tests/ref/seek/vsynth2-mpeg2-422 tests/ref/seek/vsynth2-mpeg2-idct-int tests/ref/seek/vsynth2-mpeg2-ilace tests/ref/seek/vsynth2-mpeg2-ivlc-qprd tests/ref/seek/vsynth2-mpeg2-thread tests/ref/seek/vsynth2-mpeg2-thread-ivlc tests/ref/vsynth/vsynth1-mpeg2 tests/ref/vsynth/vsynth1-mpeg2-422 tests/ref/vsynth/vsynth1-mpeg2-idct-int tests/ref/vsynth/vsynth1-mpeg2-ilace tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd tests/ref/vsynth/vsynth1-mpeg2-thread tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc tests/ref/vsynth/vsynth2-mpeg2 tests/ref/vsynth/vsynth2-mpeg2-422 tests/ref/vsynth/vsynth2-mpeg2-idct-int tests/ref/vsynth/vsynth2-mpeg2-ilace tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd tests/ref/vsynth/vsynth2-mpeg2-thread tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| acodec-adpcm-ima_qt | ||
| acodec-adpcm-ima_qt-trellis | ||
| acodec-adpcm-ima_wav | ||
| acodec-adpcm-ima_wav-trellis | ||
| acodec-adpcm-ms | ||
| acodec-adpcm-ms-trellis | ||
| acodec-adpcm-swf | ||
| acodec-adpcm-swf-trellis | ||
| acodec-adpcm-yamaha | ||
| acodec-adpcm-yamaha-trellis | ||
| acodec-alac | ||
| acodec-flac | ||
| acodec-mp2 | ||
| acodec-pcm-alaw | ||
| acodec-pcm-f32be | ||
| acodec-pcm-f32le | ||
| acodec-pcm-f64be | ||
| acodec-pcm-f64le | ||
| acodec-pcm-mulaw | ||
| acodec-pcm-s8 | ||
| acodec-pcm-s16be | ||
| acodec-pcm-s16le | ||
| acodec-pcm-s24be | ||
| acodec-pcm-s24le | ||
| acodec-pcm-s32be | ||
| acodec-pcm-s32le | ||
| acodec-pcm-u8 | ||
| lavf-aiff | ||
| lavf-alaw | ||
| lavf-asf | ||
| lavf-au | ||
| lavf-avi | ||
| lavf-bmp | ||
| lavf-dv_fmt | ||
| lavf-ffm | ||
| lavf-flv_fmt | ||
| lavf-gif | ||
| lavf-gxf | ||
| lavf-jpg | ||
| lavf-mkv | ||
| lavf-mmf | ||
| lavf-mov | ||
| lavf-mpg | ||
| lavf-mulaw | ||
| lavf-mxf | ||
| lavf-mxf_d10 | ||
| lavf-nut | ||
| lavf-ogg | ||
| lavf-pbmpipe | ||
| lavf-pcx | ||
| lavf-pgm | ||
| lavf-pgmpipe | ||
| lavf-ppm | ||
| lavf-ppmpipe | ||
| lavf-rm | ||
| lavf-sgi | ||
| lavf-swf | ||
| lavf-tga | ||
| lavf-tiff | ||
| lavf-ts | ||
| lavf-voc | ||
| lavf-wav | ||
| lavf-wtv | ||
| lavf-yuv4mpeg | ||
| vsynth2-asv1 | ||
| vsynth2-asv2 | ||
| vsynth2-dnxhd-720p | ||
| vsynth2-dnxhd-720p-rd | ||
| vsynth2-dnxhd-1080i | ||
| vsynth2-dv | ||
| vsynth2-dv-50 | ||
| vsynth2-dv-411 | ||
| vsynth2-ffv1 | ||
| vsynth2-flashsv | ||
| vsynth2-flv | ||
| vsynth2-h261 | ||
| vsynth2-h263 | ||
| vsynth2-h263p | ||
| vsynth2-huffyuv | ||
| vsynth2-jpegls | ||
| vsynth2-ljpeg | ||
| vsynth2-mjpeg | ||
| vsynth2-mpeg1 | ||
| vsynth2-mpeg1b | ||
| vsynth2-mpeg2-422 | ||
| vsynth2-mpeg2-idct-int | ||
| vsynth2-mpeg2-ilace | ||
| vsynth2-mpeg2-ivlc-qprd | ||
| vsynth2-mpeg2-thread | ||
| vsynth2-mpeg2-thread-ivlc | ||
| vsynth2-mpeg4 | ||
| vsynth2-mpeg4-adap | ||
| vsynth2-mpeg4-adv | ||
| vsynth2-mpeg4-error | ||
| vsynth2-mpeg4-nr | ||
| vsynth2-mpeg4-nsse | ||
| vsynth2-mpeg4-qpel | ||
| vsynth2-mpeg4-qprd | ||
| vsynth2-mpeg4-rc | ||
| vsynth2-mpeg4-thread | ||
| vsynth2-msmpeg4 | ||
| vsynth2-msmpeg4v2 | ||
| vsynth2-rgb | ||
| vsynth2-roqvideo | ||
| vsynth2-rv10 | ||
| vsynth2-rv20 | ||
| vsynth2-snow | ||
| vsynth2-snow-ll | ||
| vsynth2-svq1 | ||
| vsynth2-wmv1 | ||
| vsynth2-wmv2 | ||
| vsynth2-yuv | ||