• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4f6df20a
    Michael Niedermayer authored
    * qatar/master:
      avplay: Don't free video filters string until the end of decoding.
      movenc: small refactor mov_write_packet
      movenc: remove redundant check
      interplayvideo: fix av_dlog parameter type mismatch
      Drop some pointless #ifdefs.
    
    Conflicts:
    	libavcodec/interplayvideo.c
    	libavcodec/libxvidff.c
    	libavcodec/snowenc.c
    	libavformat/movenc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4f6df20a
ffplay.c 106 KB