• Michael Niedermayer's avatar
    Merge commit '0bca0283' · c079da50
    Michael Niedermayer authored
    * commit '0bca0283':
      riff: do not write empty INFO tags
    
    Conflicts:
    	tests/ref/fate/vsynth1-cljr
    	tests/ref/fate/vsynth1-ffvhuff
    	tests/ref/fate/vsynth1-h261
    	tests/ref/fate/vsynth1-h263
    	tests/ref/fate/vsynth1-h263-obmc
    	tests/ref/fate/vsynth1-h263p
    	tests/ref/fate/vsynth1-huffyuv
    	tests/ref/fate/vsynth1-jpegls
    	tests/ref/fate/vsynth1-mjpeg
    	tests/ref/fate/vsynth1-mpeg4-adap
    	tests/ref/fate/vsynth1-mpeg4-adv
    	tests/ref/fate/vsynth1-mpeg4-error
    	tests/ref/fate/vsynth1-mpeg4-nr
    	tests/ref/fate/vsynth1-mpeg4-qpel
    	tests/ref/fate/vsynth1-mpeg4-qprd
    	tests/ref/fate/vsynth1-mpeg4-rc
    	tests/ref/fate/vsynth1-mpeg4-thread
    	tests/ref/fate/vsynth1-msmpeg4
    	tests/ref/fate/vsynth1-msmpeg4v2
    	tests/ref/fate/vsynth1-rgb
    	tests/ref/fate/vsynth1-wmv1
    	tests/ref/fate/vsynth1-wmv2
    	tests/ref/fate/vsynth1-yuv
    	tests/ref/fate/vsynth2-cljr
    	tests/ref/fate/vsynth2-ffvhuff
    	tests/ref/fate/vsynth2-h261
    	tests/ref/fate/vsynth2-h263
    	tests/ref/fate/vsynth2-h263-obmc
    	tests/ref/fate/vsynth2-h263p
    	tests/ref/fate/vsynth2-huffyuv
    	tests/ref/fate/vsynth2-jpegls
    	tests/ref/fate/vsynth2-mjpeg
    	tests/ref/fate/vsynth2-mpeg4-adap
    	tests/ref/fate/vsynth2-mpeg4-error
    	tests/ref/fate/vsynth2-mpeg4-nr
    	tests/ref/fate/vsynth2-mpeg4-qpel
    	tests/ref/fate/vsynth2-mpeg4-qprd
    	tests/ref/fate/vsynth2-mpeg4-rc
    	tests/ref/fate/vsynth2-mpeg4-thread
    	tests/ref/fate/vsynth2-msmpeg4
    	tests/ref/fate/vsynth2-msmpeg4v2
    	tests/ref/fate/vsynth2-rgb
    	tests/ref/fate/vsynth2-wmv1
    	tests/ref/fate/vsynth2-wmv2
    	tests/ref/fate/vsynth2-yuv
    	tests/ref/lavf/avi
    	tests/ref/seek/h261_avi
    	tests/ref/seek/h263_avi
    	tests/ref/seek/h263p_avi
    	tests/ref/seek/lavf_avi
    	tests/ref/seek/mjpeg_avi
    	tests/ref/seek/mpeg4_adap_avi
    	tests/ref/seek/mpeg4_error_avi
    	tests/ref/seek/mpeg4_nr_avi
    	tests/ref/seek/mpeg4_qpel_avi
    	tests/ref/seek/mpeg4_qprd_avi
    	tests/ref/seek/mpeg4_rc_avi
    	tests/ref/seek/mpeg4_thread_avi
    	tests/ref/seek/msmpeg4_avi
    	tests/ref/seek/msmpeg4v2_avi
    	tests/ref/seek/wmv1_avi
    	tests/ref/seek/wmv2_avi
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c079da50
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...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README 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...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffmpeg.h Loading commit data...
ffmpeg_filter.c Loading commit data...
ffmpeg_opt.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...