diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-08 20:36:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-08 20:37:24 +0200 |
| commit | 8e1717cf12f88823b851cca706a2e5ab7aa1c7c4 (patch) | |
| tree | 5734faf6f4fa3402fa3273bf1d45aa9238b82cb9 /ffserver_config.h | |
| parent | 79c11388e1f5d1af4dadf89f8a80d081f3a9ba4b (diff) | |
| parent | c4d37cd9ef6e374bb888f6273259b10fac5bd909 (diff) | |
| download | ffmpeg-8e1717cf12f88823b851cca706a2e5ab7aa1c7c4.tar.gz | |
Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'
* commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909':
matroskadec: export cover art correctly
Conflicts:
libavformat/matroskadec.c
See: 511585ce7f7272e5069ef011d6be5f073d268901
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver_config.h')
0 files changed, 0 insertions, 0 deletions