diff options
| author | Martin Storsjö <martin@martin.st> | 2013-01-17 16:03:36 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-01-17 19:11:54 +0200 |
| commit | c749bec8c3ef88e3e12847a60d6e8e6d73c736d4 (patch) | |
| tree | ffb77c9ffff068d9af21ce32bc29c8c200683e21 | |
| parent | 9d60f608af34a3ac9716c8ef210be23498e3bfba (diff) | |
| download | ffmpeg-c749bec8c3ef88e3e12847a60d6e8e6d73c736d4.tar.gz | |
theora: Skip zero-sized headers
This fixes a regression since d9cf5f51/7a2ee770f5 with theora
over RTP (possibly with other variants of theora as well).
In theora over RTP, the second of the 3 headers turns out to be
0 bytes long, which prior to d9cf5f51 worked just fine. After
d9cf5f51, reading from the bitstream reader fails (since the reader
wasn't initialized but returned an error if initialized with 0 bits).
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e33db35b4a91ad543d9dde3a981a89118ba68937)
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/vp3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index bdd4289a49..0340c22bb2 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2339,6 +2339,8 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) } for(i=0;i<3;i++) { + if (header_len[i] <= 0) + continue; init_get_bits(&gb, header_start[i], header_len[i] * 8); ptype = get_bits(&gb, 8); |