diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:21:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:21:13 +0100 |
| commit | ff4f2036defbadc60081ba252e093abda5897d6d (patch) | |
| tree | 4458b6baaf4cfcca3ff27ff8785f3aff3fd6d755 /libavcodec/ttadata.h | |
| parent | bb7ad47ddf94511eece7e243402e2cf95cddf1df (diff) | |
| parent | c63dd3f0a48a9f6389d253597ab51caddc0118db (diff) | |
| download | ffmpeg-ff4f2036defbadc60081ba252e093abda5897d6d.tar.gz | |
Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'
* commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db':
a64multi: check elbg return values
Conflicts:
libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ttadata.h')
0 files changed, 0 insertions, 0 deletions