diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 01:42:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-05 01:42:06 +0100 |
| commit | e7724f346a92195b15659bae44114826c6d12f18 (patch) | |
| tree | db790b8eb2ddd382de2a4effb1a4644257864ba2 /doc/ffserver.conf | |
| parent | d80b9ea11da1680a3373a52a6031e2717cade25b (diff) | |
| parent | 5430839144c6da0160e8e0cfb0c8db01de432e94 (diff) | |
| download | ffmpeg-e7724f346a92195b15659bae44114826c6d12f18.tar.gz | |
Merge commit '5430839144c6da0160e8e0cfb0c8db01de432e94'
* commit '5430839144c6da0160e8e0cfb0c8db01de432e94':
eacmv: clear references on frame dimensions change
Conflicts:
libavcodec/eacmv.c
See: e9d443cf08503f7bd0149576ba9e891322de340d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffserver.conf')
0 files changed, 0 insertions, 0 deletions