• 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
compat Loading commit data...
doc Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavresample Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
INSTALL.md Loading commit data...
LICENSE.md Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README.md Loading commit data...
RELEASE Loading commit data...
arch.mak Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
cmdutils_opencl.c Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffmpeg.h Loading commit data...
ffmpeg_dxva2.c Loading commit data...
ffmpeg_filter.c Loading commit data...
ffmpeg_opt.c Loading commit data...
ffmpeg_vda.c Loading commit data...
ffmpeg_vdpau.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...