diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 22:19:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 22:19:54 +0100 |
| commit | 4809ac75fcefe198e70936d49160036818f12e2b (patch) | |
| tree | d77d672bcb8549a708a48e0426b82bba485cba09 /ffplay.c | |
| parent | 6229f7823e2a9b93a95ce27c10efc156a555c20d (diff) | |
| parent | 2383323661f3b8342b2c4d356fcfe8c5d1b045f8 (diff) | |
Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'
* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
dvbsubdec: improve error checking
Conflicts:
libavcodec/dvbsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions