]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: ee73a69)
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)
* 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>

No differences found
Unnamed repository; edit this file 'description' to name the repository.