diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 14:36:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 14:36:00 +0100 |
| commit | 365ad0042a637a421602d248f1cd9d2dc87d61c4 (patch) | |
| tree | 52411ba18f8cb4900140a30b22d732c0d3bf84ef /COPYING.GPLv2 | |
| parent | 62d36abef4b7bf49856b0838bd87f7a23910a391 (diff) | |
| parent | 0b499c9b06b29b3d3fa23122b493945dbf77f707 (diff) | |
| download | ffmpeg-365ad0042a637a421602d248f1cd9d2dc87d61c4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Make it possible to compile without error_resilience
Conflicts:
configure
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions