• Michael Niedermayer's avatar
    Merge commit '8a067941' · 5163fb94
    Michael Niedermayer authored
    * commit '8a067941':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5163fb94
Name
Last commit
Last update
..
fate Loading commit data...
filtergraphs Loading commit data...
ref Loading commit data...
Makefile Loading commit data...
audiogen.c Loading commit data...
base64.c Loading commit data...
copycooker.sh Loading commit data...
fate-run.sh Loading commit data...
fate-valgrind.supp Loading commit data...
fate.sh Loading commit data...
ffserver-regression.sh Loading commit data...
ffserver.conf Loading commit data...
ffserver.regression.ref Loading commit data...
lavf-regression.sh Loading commit data...
lena.pnm Loading commit data...
md5.sh Loading commit data...
regression-funcs.sh Loading commit data...
rotozoom.c Loading commit data...
test.ffmeta Loading commit data...
tiny_psnr.c Loading commit data...
tiny_ssim.c Loading commit data...
utils.c Loading commit data...
videogen.c Loading commit data...