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> |
||
|---|---|---|
| .. | ||
| aiff | ||
| alaw | ||
| asf | ||
| ast | ||
| au | ||
| avi | ||
| bmp | ||
| caf | ||
| dpx | ||
| dv_fmt | ||
| ffm | ||
| flm | ||
| flv_fmt | ||
| gif | ||
| gxf | ||
| ircam | ||
| ismv | ||
| jpg | ||
| mkv | ||
| mmf | ||
| mov | ||
| mpg | ||
| mulaw | ||
| mxf | ||
| mxf_d10 | ||
| nut | ||
| ogg | ||
| pam | ||
| pbmpipe | ||
| pcx | ||
| pgm | ||
| pgmpipe | ||
| pixfmt | ||
| png | ||
| ppm | ||
| ppmpipe | ||
| rm | ||
| rso | ||
| sgi | ||
| smjpeg | ||
| sox | ||
| sunrast | ||
| swf | ||
| tga | ||
| tiff | ||
| ts | ||
| voc | ||
| voc_s16 | ||
| w64 | ||
| wav | ||
| wtv | ||
| xbm | ||
| xwd | ||
| yuv4mpeg | ||