diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 13:30:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 13:31:59 +0100 |
| commit | d701f5996daf64f5abac8e402b7b62d5c48c63e1 (patch) | |
| tree | 3782a5f0f619047270b9682591e792743272f987 /libavcodec/ass_split.c | |
| parent | 8d86e7b495896946f5e3c8751f06b2fd11d8213c (diff) | |
| parent | fffca3d278c2a2422c2f61f21c5a9d5f690d328e (diff) | |
| download | ffmpeg-d701f5996daf64f5abac8e402b7b62d5c48c63e1.tar.gz | |
Merge commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e'
* commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e':
4xm: return a proper error code.
Conflicts:
libavcodec/4xm.c
See: a5e382ad7ffd8be810f3a614c4c447a1cd1936f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass_split.c')
0 files changed, 0 insertions, 0 deletions