Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 11:35:27 +0000 (13:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 11:35:27 +0000 (13:35 +0200)
commit9d1155dae303c20f51ae8579df1b8c3928c3bf21
treec1589f4d4269667a6b10d7c04574105e7962c5db
parentee73a69020a8343e827a21a0de92ca1b05f89588
parentaeb23fc4549a25ef32ff085d2a76227f90caf403
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>