• 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
vsynth2-mpeg2-thread-ivlc 2.67 KB