diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 02:55:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 02:56:18 +0100 |
| commit | 7384ec19cf13fe204317c1b88333c58cbfa6336a (patch) | |
| tree | a1dd73d724ac6e4e34cb818f9bd3d7b309be347c /libavcodec/png_parser.c | |
| parent | 9943c5a42bdf8412f60e8a33489d6f2a8b1b9d61 (diff) | |
| parent | a28468d0daf4be14761c16a3ddd33266b2380123 (diff) | |
| download | ffmpeg-7384ec19cf13fe204317c1b88333c58cbfa6336a.tar.gz | |
Merge commit 'a28468d0daf4be14761c16a3ddd33266b2380123'
* commit 'a28468d0daf4be14761c16a3ddd33266b2380123':
librtmp: append the correct field to the string
See: d1970929b5f8b873aac171586343c9d8142897ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/png_parser.c')
0 files changed, 0 insertions, 0 deletions