diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 19:01:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 19:01:26 +0200 |
| commit | 350dd8534575e89a8ed5f2bdafc24651a82338e5 (patch) | |
| tree | 5c7b5cb2cb9731692dfc64552fe0ec109aa5623e /ffmpeg.c | |
| parent | e356f6c55d46bf3e58005c4e55b2226834a2c22a (diff) | |
| parent | 4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b (diff) | |
| download | ffmpeg-350dd8534575e89a8ed5f2bdafc24651a82338e5.tar.gz | |
Merge commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b'
* commit '4d6c5152849e23a4cc0f6a6ac2880c01ebcd301b':
electronicarts: do not fail on zero-sized chunks
Conflicts:
libavformat/electronicarts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions