diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 23:18:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 23:18:45 +0200 |
| commit | 4667116c394b29a96a1017e1bf130561676cb498 (patch) | |
| tree | 6b03ff9ca2751ee22343fa613a7cf3c813d2ead6 /tools | |
| parent | fe43facd659f4bf04871d7736701011ebad98932 (diff) | |
| parent | ca1e36a8e4cd416142487071dbca734567bdaddf (diff) | |
| download | ffmpeg-4667116c394b29a96a1017e1bf130561676cb498.tar.gz | |
Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'
* commit 'ca1e36a8e4cd416142487071dbca734567bdaddf':
h264: fix build when error resilience is disabled
Conflicts:
libavcodec/h264_picture.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions