1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00

Merge commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0'

* commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0':
  wc3movie: Drop unused cruft

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-19 15:59:49 +01:00
commit 83706367e2

View File

@ -242,9 +242,6 @@ static int wc3_read_packet(AVFormatContext *s,
case TEXT_TAG: case TEXT_TAG:
/* subtitle chunk */ /* subtitle chunk */
#if 0
avio_skip(pb, size);
#else
if ((unsigned)size > sizeof(text) || (ret = avio_read(pb, text, size)) != size) if ((unsigned)size > sizeof(text) || (ret = avio_read(pb, text, size)) != size)
ret = AVERROR(EIO); ret = AVERROR(EIO);
else { else {
@ -262,7 +259,6 @@ static int wc3_read_packet(AVFormatContext *s,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_log (s, AV_LOG_DEBUG, " fronsay: %s\n", &text[i + 1]); av_log (s, AV_LOG_DEBUG, " fronsay: %s\n", &text[i + 1]);
} }
#endif
break; break;
case AUDI_TAG: case AUDI_TAG: