diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:59:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:00:24 +0200 |
| commit | 77570facdb41233a6fef9d8861023b1eeffe361f (patch) | |
| tree | 46a1a0eb14663ea65057766a50913e99cf9b3d14 /libavformat/psxstr.c | |
| parent | b507c00dc03c81002c8f9950cfd73aad9cc88702 (diff) | |
| parent | 4d7ed3e73541983459a7913c2034eba69ebc113d (diff) | |
| download | ffmpeg-77570facdb41233a6fef9d8861023b1eeffe361f.tar.gz | |
Merge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'
* commit '4d7ed3e73541983459a7913c2034eba69ebc113d':
build: output-example: Add avutil to ELIBS in link command
Conflicts:
libavformat/Makefile
No change as our example build code doesnt have this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/psxstr.c')
0 files changed, 0 insertions, 0 deletions