Michael Niedermayer 76c63bc5d8 Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f' ...

* commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f':
  lavf: remove a pointless check

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-01-06 15:34:45 +01:00

148 KiB

Raw Blame History

View Raw