diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:00:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:00:05 +0200 |
| commit | 65120f628ca5facb8ae5e14d923ed31218bc9409 (patch) | |
| tree | 5e5b04cf5ee5a22562524da3bc07184bb60d253e /libavcodec/assenc.c | |
| parent | a87e85fa722e34639fe53d64586faa309f51afcc (diff) | |
| parent | 85deb51a01f1ecc5ac5faa52ad8ea141c384e23a (diff) | |
| download | ffmpeg-65120f628ca5facb8ae5e14d923ed31218bc9409.tar.gz | |
Merge commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a'
* commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a':
h264: Only initialize dsputil if error resilience is enabled
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assenc.c')
0 files changed, 0 insertions, 0 deletions