diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:05:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:05:18 +0100 |
| commit | b094931ab91108950fec221291bebcbc7b0ac12a (patch) | |
| tree | 91853f8c8b2e42fd0b25826c75ab86ba53083ce2 /libavformat/img2enc.c | |
| parent | 6c17ff84ad8f2be64ddc9bd4955e1cc87842ac29 (diff) | |
| parent | 06b54e84254e4834b4978ff5b27cc2b7ee8d7a98 (diff) | |
| download | ffmpeg-b094931ab91108950fec221291bebcbc7b0ac12a.tar.gz | |
Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'
* commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98':
build: Fix error_resilience code dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2enc.c')
0 files changed, 0 insertions, 0 deletions