diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 11:42:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 11:43:33 +0200 |
| commit | f351afb5f9dedc33260b8811223dc39c81bbcec3 (patch) | |
| tree | eb2c6806bdd73f06bd84c719240674d0a0d42b41 /libavfilter/fifo.c | |
| parent | 9195c26d454ca750359db87b1127cd4926c536bd (diff) | |
| parent | 17e9d52c8c93f47721ff481b8867922f4b4bd663 (diff) | |
| download | ffmpeg-f351afb5f9dedc33260b8811223dc39c81bbcec3.tar.gz | |
Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'
* commit '17e9d52c8c93f47721ff481b8867922f4b4bd663':
hevc_ps: remove a write-only variable
Conflicts:
libavcodec/hevc_ps.c
See: ba70563d5549fdbde4c254c9334a123c439ccc30
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/fifo.c')
0 files changed, 0 insertions, 0 deletions