projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 564eabe fe66671)
Merge commit 'fe66671bd5f446f8d0a9c70968ba8fe891efe028'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:06:30 +0000 (14:06 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:06:30 +0000 (14:06 +0100)
* commit 'fe66671bd5f446f8d0a9c70968ba8fe891efe028':
  cmdutils: Check for and report the correct codec capability

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
cmdutils.c patch | diff1 | diff2 | blob | history

diff --cc cmdutils.c
Simple merge
FFmpeg git repo