• 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
mjpeg_avi 2.67 KB