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)
Pull request:  ffmpeg fix to properly detect video in SageTV recordings (ffmpeg bug #2147)


Trivial merge