diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-04 21:21:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-04 21:21:46 +0200 |
| commit | f85746509ca8b727d97ff801a63a22f81fd27a0c (patch) | |
| tree | e9c655fc06a82cb49b94fb500b453261efe7b846 /ffserver.c | |
| parent | 82de3e16a8aac7607a1e37f0ad61a5a51238e2ac (diff) | |
| parent | fcf550c2cbc35c1c4d90f8d23bb3340ebc31ce46 (diff) | |
| download | ffmpeg-f85746509ca8b727d97ff801a63a22f81fd27a0c.tar.gz | |
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
zerocodec: Fix memleak in decode_frame
zerocodec: Cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions