Merge branch 'master' into 0.11
Conflicts: configure.ac ext/ffmpeg/gstffmpegcodecmap.c ext/ffmpeg/gstffmpegdec.c ext/ffmpeg/gstffmpegdeinterlace.c ext/ffmpeg/gstffmpegmux.c ext/libswscale/gstffmpegscale.c
No related branches found
No related tags found
Showing
- ext/ffmpeg/gstffmpegaudioresample.c 2 additions, 4 deletionsext/ffmpeg/gstffmpegaudioresample.c
- ext/ffmpeg/gstffmpegdec.c 38 additions, 26 deletionsext/ffmpeg/gstffmpegdec.c
- ext/ffmpeg/gstffmpegmux.c 21 additions, 18 deletionsext/ffmpeg/gstffmpegmux.c
- ext/ffmpeg/gstffmpegscale.c 2 additions, 4 deletionsext/ffmpeg/gstffmpegscale.c
- ext/libpostproc/gstpostproc.c 4 additions, 4 deletionsext/libpostproc/gstpostproc.c
- gst-libs/ext/libav 1 addition, 1 deletiongst-libs/ext/libav
Loading
Please register or sign in to comment