projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f16ab1 963aa1d)
Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Dec 2014 00:47:46 +0000 (01:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Dec 2014 00:52:01 +0000 (01:52 +0100)
* cehoyos/master:
  Fix standalone compilation of the iec61883 input device.

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

Trivial merge
FFmpeg git repo