projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a51867e f4ca8ea)
Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'
authorClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 13:17:59 +0000 (15:17 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 13:17:59 +0000 (15:17 +0200)
* commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6':
  rtmpproto: Restructure zlib code to avoid unreachable code warning

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavformat/rtmpproto.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/rtmpproto.c
Simple merge
FFmpeg git repo