]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42b5a6f 304ec08)
Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Nov 2011 17:56:56 +0000 (18:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Nov 2011 17:57:09 +0000 (18:57 +0100)
* cus/stable:
  ffplay: Avoid useage of deprecated url_fileno().

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.