projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a830b9 3c5cf2a)
Merge commit '3c5cf2a31b4b29a8e4282cbe6a3f0617c14698b8'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:05:41 +0000 (14:05 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:05:41 +0000 (14:05 +0100)
* commit '3c5cf2a31b4b29a8e4282cbe6a3f0617c14698b8':
  screenpresso: Drop parameter change check

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

diff --cc libavcodec/screenpresso.c
Simple merge
FFmpeg git repo