aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-08-02 10:38:33 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-08-02 10:38:33 +0200
commita130ec9540b4a56b315c24285623b867c4c6f95c (patch)
tree509257f38c3af574e38189633bc99e89f84b2b29 /ffplay.c
parent9ed59f16e005554fe412bcc05b2ed40688f4fd16 (diff)
parentae365453c370c85f278bff7fbf9e20d9d335cb2a (diff)
downloadffmpeg-a130ec9540b4a56b315c24285623b867c4c6f95c.tar.gz
Merge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'
* commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a': rc4: add av_rc4_alloc() Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions