diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 19:21:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 20:22:45 +0200 |
| commit | a50b00822784f6b098eb634132ad75394f1d26c0 (patch) | |
| tree | 6b6ed6e4060c4ca6bc0c3c7ef06a617376a7a36e /libavcodec/jfdctfst.c | |
| parent | 93e7b7fb346441dd2bafa8caef4df596f1fae1cb (diff) | |
| parent | b114f6d48a06a4dad6882bc83e07463905f004c4 (diff) | |
| download | ffmpeg-a50b00822784f6b098eb634132ad75394f1d26c0.tar.gz | |
Merge commit 'b114f6d48a06a4dad6882bc83e07463905f004c4'
* commit 'b114f6d48a06a4dad6882bc83e07463905f004c4':
avconv: factor out flushing the filters
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jfdctfst.c')
0 files changed, 0 insertions, 0 deletions