diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-01 14:22:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-01 14:23:05 +0200 |
| commit | 75a4b91f8354fbae24a38b94b26ddac6a114014e (patch) | |
| tree | f4905ecdf726c8f40a2e4106f50e85726689588d /ffplay.c | |
| parent | 899101d3d39d8165aa3c767efdb1d9c8a010d16d (diff) | |
| parent | e30967710028950426c1c02f86a3bdaf463e5dce (diff) | |
| download | ffmpeg-75a4b91f8354fbae24a38b94b26ddac6a114014e.tar.gz | |
Merge remote-tracking branch 'stev47/master'
* stev47/master:
cpia: move reget_buffer after header check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions