Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Jun 2013 23:25:32 +0000 (01:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Jun 2013 23:25:50 +0000 (01:25 +0200)
commit602d0bfe67ce20e169433ca583153e5c01c84016
tree995e83b980b76935144df98082d73ddd43bbeb09
parentf8ca8138f01d0a7d96d4e1ea65fecd1197f96206
parent2090abcc436df92969634577c91ea1d1143d4533
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>