diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:38:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 02:38:34 +0100 |
| commit | d48d2f166d6543b930ffa486b780bf8b14d6554a (patch) | |
| tree | a623139f5964050e2953daf0b17189a360812e69 /libavcodec/xiph.c | |
| parent | e82140b09b0f6ab7b64899bec12221dc582f1b95 (diff) | |
| parent | 29e720da76ca353dbda9f881562902b41c355b77 (diff) | |
| download | ffmpeg-d48d2f166d6543b930ffa486b780bf8b14d6554a.tar.gz | |
Merge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4
* commit '29e720da76ca353dbda9f881562902b41c355b77':
librtmp: append the correct field to the string
See: d1970929b5f8b873aac171586343c9d8142897ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions