diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 18:03:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 18:03:27 +0200 |
| commit | 9042c8a4db9bde455ee50bb27f84f0dfadae8315 (patch) | |
| tree | 21f39b058f955087437bea513c141dd23f67c27a /libavformat/framecrcenc.c | |
| parent | 118a1c2f4c2385f629a7be8479cbb20eaf391cac (diff) | |
| parent | b198e33ad8b3e2f11d525cd6bcd211d6298ba81c (diff) | |
| download | ffmpeg-9042c8a4db9bde455ee50bb27f84f0dfadae8315.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: fix build with disabled avfilter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/framecrcenc.c')
0 files changed, 0 insertions, 0 deletions