Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Apr 2012 20:50:22 +0000 (22:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Apr 2012 20:50:22 +0000 (22:50 +0200)
commit4f6df20a008e52e767550e1ea94280a15c1408b6
tree85c15434d2d725cd018a878f7bef75ee13765817
parent8e357e8e759b36e5609ccd12a9e324aee0e8afc8
parente1ce756844e684876318570dcebc74bc66c084f0
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
ffplay.c
libavcodec/interplayvideo.c
libavcodec/libxvidff.c
libavcodec/snowenc.c
libavformat/movenc.c
libavformat/nutdec.c