Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 14:34:45 +0000 (15:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 14:34:45 +0000 (15:34 +0100)
commit76c63bc5d8567817c229adc6a6fcd9cbd902f0d8
tree7c7bf24456e1450163b97d8ce94cf7fd95073cce
parent59725592a97fc65a917001bc248567666dfded5a
parent3867f3718ba82ff11d3e24c6d84beb520d0b174f
Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'

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

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c