@@ -458,19 +458,19 @@ module RVideo # :nodoc: FPS = 'fps(?:\(r\))?' VIDEO_MATCH_PATTERN = / - Stream\s*(\#[\d.]+)(?:[\(\[].+?[\)\]])?\s* # stream id - [,:]\s* - (?:#{RATE}\s*#{FPS}[,:]\s*)? # frame rate, older builds - Video:\s* - #{VAL}#{SEP} # codec - (?:#{VAL}#{SEP})? # color space - (\d+)x(\d+) # resolution - (?:\s*\[(?:PAR\s*(\d+:\d+))?\s*(?:DAR\s*(\d+:\d+))?\])? # pixel and display aspect ratios + Stream\s*(\#[\d.]+)(?:[\(\[].+?[\)\]])?\s* # stream id + [,:]\s* + (?:#{RATE}\s*#{FPS}[,:]\s*)? # frame rate, older builds + Video:\s* + #{VAL}#{SEP} # codec + (?:#{VAL}#{SEP})? # color space + (\d+)x(\d+) # resolution + (?:\s*\[?(?:PAR\s*(\d+:\d+))?\s*(?:DAR\s*(\d+:\d+))?\]?)? # pixel and display aspect ratios #{SEP}? - (?:#{RATE}\s*(kb\/s)#{SEP}?)? # video bit rate - (?:#{RATE}\s*(?:tbr|#{FPS})#{SEP}?)? # frame rate - (?:#{RATE}\s*tbn#{SEP}?)? # time base - (?:#{RATE}\s*tbc#{SEP}?)? # codec time base + (?:#{RATE}\s*(kb\/s)#{SEP}?)? # video bit rate + (?:#{RATE}\s*(?:tb\(?r\)?|#{FPS})#{SEP}?)? # frame rate + (?:#{RATE}\s*tbn#{SEP}?)? # time base + (?:#{RATE}\s*tbc#{SEP}?)? # codec time base /x def video_match lib/rvideo/inspector.rb ffc32f136d0a402a16af8466474348c6031ca4ca Seth Thomas Rasmussen sethrasmussen@gmail.com http://github.com/greatseth/rvideo/commit/7ef699e0d58cae99c2e8f4c1519574d24f911c85 7ef699e0d58cae99c2e8f4c1519574d24f911c85 2009-04-13T14:16:48-07:00 2009-04-13T14:16:48-07:00 Fix some backwards compat issues with ffmpeg and Inspector - Fix braced version of tbr in some versions of ffmpeg [kakra] - Fix detection of some video streams [kakra] 7480e55dc8c04ebaa4714efc79e7572b57aa9c1f Seth Thomas Rasmussen sethrasmussen@gmail.com