]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b46f191 a6b3613)
Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 11:47:01 +0000 (13:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 11:47:06 +0000 (13:47 +0200)
* commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb':
  rtmpproto: Print the error code string if there's no description

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtmpproto.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/rtmpproto.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.