From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 17 Oct 2014 11:35:27 +0000 (+0200)
Subject: Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9d1155dae303c20f51ae8579df1b8c3928c3bf21;hp=ee73a69020a8343e827a21a0de92ca1b05f89588;p=ffmpeg

Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'

* commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403':
  avprobe: Remove a pointless check

Conflicts:
	avprobe.c

No change as the code does not exist in ffprobe

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