aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-01 11:47:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-01 11:47:42 +0200
commitd2c613dd1460a34ca166550d5d9d8cdd5cf278df (patch)
tree905ae19fbbe79b69367b68e8e351232f17d47041 /ffplay.c
parent57b8ce414be574a772d386f57afa502eac072085 (diff)
parent54e03ff6af8a070f1055edd26028f3f7b2e2ca8e (diff)
downloadffmpeg-d2c613dd1460a34ca166550d5d9d8cdd5cf278df.tar.gz
Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'
* commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e': rtpproto: Support nonblocking reads Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions