diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-20 00:14:59 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-20 00:15:06 +0100 |
commit | c8a441efe24ceb0446a09e82d648a5f4e76d264d (patch) | |
tree | 06b992a2fffa62ddc57c75d7cd775351a8a6fe0c /libavformat/lxfdec.c | |
parent | b08a742526d05bcf300af820da5c79d2a05f9959 (diff) | |
parent | 708df4ac66d6b620c216d4d7d48b1da66b8a3b02 (diff) | |
download | ffmpeg-c8a441efe24ceb0446a09e82d648a5f4e76d264d.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: remove global video state
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/lxfdec.c')
0 files changed, 0 insertions, 0 deletions