Merge pull request #2118 from gallatin/master
authorjmarshallnz <jcmarsha@gmail.com>
Fri, 25 Jan 2013 20:33:27 +0000 (12:33 -0800)
committerjmarshallnz <jcmarsha@gmail.com>
Fri, 25 Jan 2013 20:33:27 +0000 (12:33 -0800)
commit3455093699f5d4eeaed8658fbdf711bae663940c
tree477aed715f1d2b49c428808bd5592ca3cbac7498
parent522844ed1e92b0e1039f13f81af5493765a0354d
parentb9bbcd1f045ea0a4a2fab25856a6a75b433517af
Merge pull request #2118 from gallatin/master

Pull request:  ffmpeg fix to properly detect video in SageTV recordings (ffmpeg bug #2147)