diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 15:59:49 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 15:59:49 +0100 |
| commit | 83706367e2b5693e093954997b19af5031b8e2ff (patch) | |
| tree | 16ed6c0356fb8be8c443e67e5de818a8dcf52c39 /libavformat/wc3movie.c | |
| parent | 2f42aef3e40c03699bab028c8951f8d2fbc85540 (diff) | |
| parent | a4b1b5aa281cacde8351d9947b54ccf82ff10cd0 (diff) | |
| download | ffmpeg-83706367e2b5693e093954997b19af5031b8e2ff.tar.gz | |
Merge commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0'
* commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0':
wc3movie: Drop unused cruft
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/wc3movie.c')
| -rw-r--r-- | libavformat/wc3movie.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index 642dcbbf7e..d8fc18eb5f 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -242,9 +242,6 @@ static int wc3_read_packet(AVFormatContext *s, case TEXT_TAG: /* subtitle chunk */ -#if 0 - avio_skip(pb, size); -#else if ((unsigned)size > sizeof(text) || (ret = avio_read(pb, text, size)) != size) ret = AVERROR(EIO); else { @@ -262,7 +259,6 @@ static int wc3_read_packet(AVFormatContext *s, return AVERROR_INVALIDDATA; av_log (s, AV_LOG_DEBUG, " fronsay: %s\n", &text[i + 1]); } -#endif break; case AUDI_TAG: |